|
@@ -2,7 +2,7 @@
|
|
|
# User Mike Hommey <mh+mozilla@glandium.org>
|
|
|
# Date 1590787792 0
|
|
|
# Node ID 23f9231f76bf57f5b8a1928c575f3ed1c503f44e
|
|
|
-# Parent 0bc958b7a41a1092e5f852ebece3cd734ed9417e
|
|
|
+# Parent 5b816857f1f5d2f137a9f72474f27815b4913809
|
|
|
Bug 1635764 - Move --with-system-icu and --with-intl-api to python configure. r=firefox-build-system-reviewers,rstewart
|
|
|
|
|
|
At the same time, because it's now simpler to do so, set the right data
|
|
@@ -142,10 +142,10 @@ deleted file mode 100644
|
|
|
diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
|
|
|
--- a/build/moz.configure/old.configure
|
|
|
+++ b/build/moz.configure/old.configure
|
|
|
-@@ -261,29 +261,27 @@ def old_configure_options(*options):
|
|
|
+@@ -254,27 +254,25 @@ def old_configure_options(*options):
|
|
|
+ '--with-app-basename',
|
|
|
'--with-app-name',
|
|
|
'--with-branding',
|
|
|
- '--with-cross-lib',
|
|
|
'--with-debug-label',
|
|
|
'--with-distribution-id',
|
|
|
'--with-doc-include-dirs',
|
|
@@ -160,8 +160,6 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
|
|
|
'--with-nspr-prefix',
|
|
|
'--with-nss-exec-prefix',
|
|
|
'--with-nss-prefix',
|
|
|
- '--with-qemu-exe',
|
|
|
- '--with-sixgill',
|
|
|
'--with-system-bz2',
|
|
|
- '--with-system-icu',
|
|
|
'--with-system-libevent',
|
|
@@ -197,28 +195,15 @@ diff --git a/js/app.mozbuild b/js/app.mozbuild
|
|
|
diff --git a/js/moz.configure b/js/moz.configure
|
|
|
--- a/js/moz.configure
|
|
|
+++ b/js/moz.configure
|
|
|
-@@ -429,20 +429,82 @@ js_option('--enable-pipeline-operator',
|
|
|
- @depends('--enable-pipeline-operator')
|
|
|
- def enable_pipeline_operator(value):
|
|
|
- if value:
|
|
|
- return True
|
|
|
+@@ -490,8 +490,69 @@ set_config('EDITLINE_LIBS', ['-lreadline
|
|
|
|
|
|
- set_config('ENABLE_PIPELINE_OPERATOR', enable_pipeline_operator)
|
|
|
- set_define('ENABLE_PIPELINE_OPERATOR', enable_pipeline_operator)
|
|
|
+ @depends('--enable-readline', editline, when=editline)
|
|
|
+ def bundled_editline(readline, editline):
|
|
|
+ return editline and not readline
|
|
|
|
|
|
-+
|
|
|
- # Initial support for new regexp engine
|
|
|
- # ==================================================
|
|
|
-
|
|
|
- js_option('--enable-new-regexp', default=False, help='Enable new regexp engine')
|
|
|
-
|
|
|
- @depends('--enable-new-regexp')
|
|
|
- def enable_new_regexp(value):
|
|
|
- if value:
|
|
|
- return True
|
|
|
+ set_config('JS_BUNDLED_EDITLINE', bundled_editline)
|
|
|
|
|
|
- set_config('ENABLE_NEW_REGEXP', enable_new_regexp)
|
|
|
- set_define('ENABLE_NEW_REGEXP', enable_new_regexp)
|
|
|
+ set_define('EDITLINE', True, when=editline)
|
|
|
+
|
|
|
+
|
|
|
+# ECMAScript Internationalization API Support (uses ICU)
|
|
@@ -304,7 +289,7 @@ diff --git a/js/src/aclocal.m4 b/js/src/aclocal.m4
|
|
|
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
|
|
|
--- a/js/src/old-configure.in
|
|
|
+++ b/js/src/old-configure.in
|
|
|
-@@ -1549,25 +1549,16 @@ AC_SUBST_LIST(MOZ_FIX_LINK_PATHS)
|
|
|
+@@ -1463,25 +1463,16 @@ AC_SUBST_LIST(MOZ_FIX_LINK_PATHS)
|
|
|
AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
|
|
|
|
|
|
AC_SUBST(MOZ_APP_NAME)
|
|
@@ -356,7 +341,7 @@ diff --git a/js/sub.configure b/js/sub.configure
|
|
|
diff --git a/old-configure.in b/old-configure.in
|
|
|
--- a/old-configure.in
|
|
|
+++ b/old-configure.in
|
|
|
-@@ -3074,28 +3074,16 @@ if test -n "$MOZ_TELEMETRY_REPORTING" ||
|
|
|
+@@ -3078,28 +3078,16 @@ if test -n "$MOZ_TELEMETRY_REPORTING" ||
|
|
|
AC_DEFINE(MOZ_DATA_REPORTING)
|
|
|
AC_SUBST(MOZ_DATA_REPORTING)
|
|
|
fi
|