From 43034a36e132ac4394e26cbfb4d855bd6f5114b3 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 27 Apr 2018 19:16:45 +0200 Subject: Remove jemalloc 4 from our tree. --- js/src/old-configure.in | 2 -- 1 file changed, 2 deletions(-) (limited to 'js/src/old-configure.in') diff --git a/js/src/old-configure.in b/js/src/old-configure.in index 1736cc5d4..7432ab9e2 100644 --- a/js/src/old-configure.in +++ b/js/src/old-configure.in @@ -2244,8 +2244,6 @@ AC_SUBST(JS_LIBRARY_NAME) AC_SUBST(JS_CONFIG_MOZ_JS_LIBS) AC_SUBST(JS_CONFIG_LIBS) -MOZ_SUBCONFIGURE_JEMALLOC() - # Avoid using obsolete NSPR features AC_DEFINE(NO_NSPR_10_SUPPORT) -- cgit v1.2.3 From 927868e8b93f508fe89ee82f618f4a1761366f70 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sun, 29 Apr 2018 13:27:12 +0200 Subject: Move --enable-tests out of Python configure and flip the default. --- js/src/old-configure.in | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'js/src/old-configure.in') diff --git a/js/src/old-configure.in b/js/src/old-configure.in index 7432ab9e2..162a071d7 100644 --- a/js/src/old-configure.in +++ b/js/src/old-configure.in @@ -1533,6 +1533,14 @@ MOZ_ARG_ENABLE_STRING(ui-locale, MOZ_UI_LOCALE=$enableval ) AC_SUBST(MOZ_UI_LOCALE) +dnl ======================================================== +dnl Build the tests? +dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(tests, +[ --enable-tests Build test libraries & programs], + ENABLE_TESTS=1, + ENABLE_TESTS= ) + dnl ======================================================== dnl = dnl = Module specific options @@ -2091,6 +2099,8 @@ AC_SUBST(MOZ_DEBUG_LDFLAGS) AC_SUBST(WARNINGS_AS_ERRORS) AC_SUBST(LIBICONV) +AC_SUBST(ENABLE_TESTS) + AC_SUBST(ENABLE_STRIP) AC_SUBST(PKG_SKIP_STRIP) AC_SUBST(INCREMENTAL_LINKER) -- cgit v1.2.3 From adf982f3cb42be25c01301d107d90c3a8a9ce179 Mon Sep 17 00:00:00 2001 From: JustOff Date: Fri, 4 May 2018 17:28:00 +0300 Subject: Fix regex escaping in old-configure and js/src/old-configure --- js/src/old-configure.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'js/src/old-configure.in') diff --git a/js/src/old-configure.in b/js/src/old-configure.in index 162a071d7..8abea5956 100644 --- a/js/src/old-configure.in +++ b/js/src/old-configure.in @@ -734,12 +734,14 @@ case "$target" in dnl VS2012+ defaults to -arch:SSE2. We want to target nothing dnl more recent, so set that explicitly here unless another dnl target arch has already been set. + changequote(,) if test -z `echo $CFLAGS | grep -i [-/]arch:` ; then CFLAGS="$CFLAGS -arch:SSE2" - fi + fi if test -z `echo $CXXFLAGS | grep -i [-/]arch:` ; then CXXFLAGS="$CXXFLAGS -arch:SSE2" fi + changequote([,]) fi dnl VS2013+ requires -FS when parallel building by make -jN. dnl If nothing, compiler sometimes causes C1041 error. -- cgit v1.2.3