Skip to content

Commit ef16f52

Browse files
committed
Add --with-system-libs configure option
Encompasses --with-system-gc, --with-system-memtailor, --with-system-mathic, and --with-system-mathicgb
1 parent afab4af commit ef16f52

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

M2/BUILD/docker/fedora/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ rpmlint:; docker run $(VOLUME) -it --entrypoint "" $(TAG) bash -c "rpmlint M2/
1414
## autotools build
1515
## TODO: generalize this to other distros, move to toplevel Makefile
1616

17-
CONFIG_OPT = --with-system-gc --with-system-memtailor --with-system-mathic \
18-
--with-system-mathicgb --enable-download --enable-rpm --prefix=/usr
17+
CONFIG_OPT = --with-system-libs --enable-download --enable-rpm --prefix=/usr
1918

2019
define M2_BUILD_SCRIPT_autotools
2120
set -xe

M2/configure.ac

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -712,13 +712,18 @@ else if test $SHARED = no -a $TRY_STATIC = yes
712712
fi
713713
fi
714714

715+
AC_ARG_WITH([system-libs],
716+
[AS_HELP_STRING([--with-system-libs],
717+
[use system gc, memtailor, mathic, and mathicgb instead of building them])],,
718+
[with_system_libs=no])
719+
715720
## we build gc by default so we can configure it for large memory spaces
716721
## see issue #2445
717722
AC_ARG_WITH([system-gc],
718723
[AS_HELP_STRING([--with-system-gc],
719724
[use system gc instead of building it])],
720725
[],
721-
[with_system_gc=no])
726+
[with_system_gc=$with_system_libs])
722727

723728
AS_IF([test "x$with_system_gc" = xyes],
724729
[AC_MSG_CHECKING(whether package bdw-gc is provided)
@@ -1311,7 +1316,7 @@ AS_IF([test $BUILD_tbb = yes],
13111316
AC_ARG_WITH([system-memtailor],
13121317
[AS_HELP_STRING([--with-system-memtailor],
13131318
[use system memtailor instead of building git submodule])],,
1314-
[with_system_memtailor=no])
1319+
[with_system_memtailor=$with_system_libs])
13151320
if test $with_system_memtailor = no
13161321
then
13171322
BUILD_memtailor=yes
@@ -1327,7 +1332,7 @@ fi
13271332
AC_ARG_WITH([system-mathic],
13281333
[AS_HELP_STRING([--with-system-mathic],
13291334
[use system mathic instead of building git submodule])],,
1330-
[with_system_mathic=no])
1335+
[with_system_mathic=$with_system_libs])
13311336
if test $with_system_mathic = no
13321337
then
13331338
BUILD_mathic=yes
@@ -1343,7 +1348,7 @@ fi
13431348
AC_ARG_WITH([system-mathicgb],
13441349
[AS_HELP_STRING([--with-system-mathicgb],
13451350
[use system mathicgb instead of building git submodule])],,
1346-
[with_system_mathicgb=no])
1351+
[with_system_mathicgb=$with_system_libs])
13471352
if test $with_system_mathicgb = no
13481353
then
13491354
BUILD_mathicgb=yes

0 commit comments

Comments
 (0)