|
@@ -3,7 +3,7 @@
|
|
# Date 1590100726 0
|
|
# Date 1590100726 0
|
|
# Thu May 21 22:38:46 2020 +0000
|
|
# Thu May 21 22:38:46 2020 +0000
|
|
# Node ID a98fde98a836ac69aa7b1fedf3616ab969c3b8a0
|
|
# Node ID a98fde98a836ac69aa7b1fedf3616ab969c3b8a0
|
|
-# Parent 5758d4b24dfbb26e830f1e9a469385d14e4fefd7
|
|
|
|
|
|
+# Parent 7b168ce74c1f34cd3d37e526dca78fa44587204b
|
|
Bug 1639815 - Move --with-qemu-exe and --with-cross-lib to python configure. r=froydnj
|
|
Bug 1639815 - Move --with-qemu-exe and --with-cross-lib to python configure. r=froydnj
|
|
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D76285
|
|
Differential Revision: https://phabricator.services.mozilla.com/D76285
|
|
@@ -11,7 +11,7 @@ Differential Revision: https://phabricator.services.mozilla.com/D76285
|
|
diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
|
|
diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
|
|
--- a/build/moz.configure/old.configure
|
|
--- a/build/moz.configure/old.configure
|
|
+++ b/build/moz.configure/old.configure
|
|
+++ b/build/moz.configure/old.configure
|
|
-@@ -254,31 +254,29 @@ def old_configure_options(*options):
|
|
|
|
|
|
+@@ -255,32 +255,30 @@ def old_configure_options(*options):
|
|
'--libdir',
|
|
'--libdir',
|
|
'--prefix',
|
|
'--prefix',
|
|
'--with-android-distribution-directory',
|
|
'--with-android-distribution-directory',
|
|
@@ -26,6 +26,7 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
|
|
'--with-doc-include-dirs',
|
|
'--with-doc-include-dirs',
|
|
'--with-doc-input-dirs',
|
|
'--with-doc-input-dirs',
|
|
'--with-doc-output-dir',
|
|
'--with-doc-output-dir',
|
|
|
|
+ '--with-intl-api',
|
|
'--with-jitreport-granularity',
|
|
'--with-jitreport-granularity',
|
|
'--with-macbundlename-prefix',
|
|
'--with-macbundlename-prefix',
|
|
'--with-nspr-cflags',
|
|
'--with-nspr-cflags',
|
|
@@ -37,24 +38,25 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
|
|
- '--with-qemu-exe',
|
|
- '--with-qemu-exe',
|
|
'--with-sixgill',
|
|
'--with-sixgill',
|
|
'--with-system-bz2',
|
|
'--with-system-bz2',
|
|
|
|
+ '--with-system-icu',
|
|
'--with-system-libevent',
|
|
'--with-system-libevent',
|
|
'--with-system-nspr',
|
|
'--with-system-nspr',
|
|
'--with-system-nss',
|
|
'--with-system-nss',
|
|
'--with-system-png',
|
|
'--with-system-png',
|
|
'--with-system-zlib',
|
|
'--with-system-zlib',
|
|
- '--with-unify-dist',
|
|
|
|
diff --git a/js/moz.configure b/js/moz.configure
|
|
diff --git a/js/moz.configure b/js/moz.configure
|
|
--- a/js/moz.configure
|
|
--- a/js/moz.configure
|
|
+++ b/js/moz.configure
|
|
+++ b/js/moz.configure
|
|
-@@ -444,16 +444,26 @@ js_option('--enable-new-regexp', default
|
|
|
|
|
|
+@@ -443,8 +443,17 @@ js_option('--enable-new-regexp', default
|
|
|
|
+
|
|
|
|
+ @depends('--enable-new-regexp')
|
|
def enable_new_regexp(value):
|
|
def enable_new_regexp(value):
|
|
if value:
|
|
if value:
|
|
return True
|
|
return True
|
|
|
|
|
|
set_config('ENABLE_NEW_REGEXP', enable_new_regexp)
|
|
set_config('ENABLE_NEW_REGEXP', enable_new_regexp)
|
|
set_define('ENABLE_NEW_REGEXP', enable_new_regexp)
|
|
set_define('ENABLE_NEW_REGEXP', enable_new_regexp)
|
|
-
|
|
|
|
-
|
|
|
|
|
|
++
|
|
+# Options for generating the shell as a script
|
|
+# Options for generating the shell as a script
|
|
+# ============================================
|
|
+# ============================================
|
|
+js_option('--with-qemu-exe', nargs=1, help='Use path as an arm emulator on host platforms')
|
|
+js_option('--with-qemu-exe', nargs=1, help='Use path as an arm emulator on host platforms')
|
|
@@ -63,20 +65,10 @@ diff --git a/js/moz.configure b/js/moz.configure
|
|
+js_option('--with-cross-lib', nargs=1, default=depends(target.alias)(lambda x: '/usr/%s' % x),
|
|
+js_option('--with-cross-lib', nargs=1, default=depends(target.alias)(lambda x: '/usr/%s' % x),
|
|
+ help='Use dir as the location for arm libraries')
|
|
+ help='Use dir as the location for arm libraries')
|
|
+set_config('CROSS_LIB', depends_if('--with-cross-lib')(lambda x: x))
|
|
+set_config('CROSS_LIB', depends_if('--with-cross-lib')(lambda x: x))
|
|
-+
|
|
|
|
-+
|
|
|
|
- # ECMAScript Internationalization API Support (uses ICU)
|
|
|
|
- # ======================================================
|
|
|
|
- js_option('--with-system-icu', help='Use system ICU')
|
|
|
|
-
|
|
|
|
- system_icu = pkg_check_modules('MOZ_ICU', 'icu-i18n >= 67.1', when='--with-system-icu')
|
|
|
|
-
|
|
|
|
- set_config('MOZ_SYSTEM_ICU', True, when=system_icu)
|
|
|
|
- set_define('MOZ_SYSTEM_ICU', True, when=system_icu)
|
|
|
|
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
|
|
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
|
|
--- a/js/src/old-configure.in
|
|
--- a/js/src/old-configure.in
|
|
+++ b/js/src/old-configure.in
|
|
+++ b/js/src/old-configure.in
|
|
-@@ -1503,31 +1503,16 @@ dnl ====================================
|
|
|
|
|
|
+@@ -1518,31 +1518,16 @@ dnl ====================================
|
|
dnl =
|
|
dnl =
|
|
dnl = Standalone module options
|
|
dnl = Standalone module options
|
|
dnl =
|
|
dnl =
|