[arch-commits] Commit in js60/repos/extra-x86_64 (8 files)

Jan Steffens heftig at archlinux.org
Thu May 9 14:23:32 UTC 2019


    Date: Thursday, May 9, 2019 @ 14:23:31
  Author: heftig
Revision: 352796

archrelease: copy trunk to extra-x86_64

Added:
  js60/repos/extra-x86_64/PKGBUILD
    (from rev 352795, js60/trunk/PKGBUILD)
  js60/repos/extra-x86_64/bug1415202.patch
    (from rev 352795, js60/trunk/bug1415202.patch)
  js60/repos/extra-x86_64/mozjs52-include-configure-script.patch
    (from rev 352795, js60/trunk/mozjs52-include-configure-script.patch)
  js60/repos/extra-x86_64/mozjs60-fix-soname.patch
    (from rev 352795, js60/trunk/mozjs60-fix-soname.patch)
Deleted:
  js60/repos/extra-x86_64/PKGBUILD
  js60/repos/extra-x86_64/bug1415202.patch
  js60/repos/extra-x86_64/mozjs52-include-configure-script.patch
  js60/repos/extra-x86_64/mozjs60-fix-soname.patch

----------------------------------------+
 PKGBUILD                               |  176 ++++++++++-----------
 bug1415202.patch                       |  254 +++++++++++++++----------------
 mozjs52-include-configure-script.patch |  126 +++++++--------
 mozjs60-fix-soname.patch               |   50 +++---
 4 files changed, 303 insertions(+), 303 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-09 14:23:12 UTC (rev 352795)
+++ PKGBUILD	2019-05-09 14:23:31 UTC (rev 352796)
@@ -1,88 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=js60
-pkgver=60.6.1
-pkgrel=1
-_ffver=${pkgver%%.*}
-pkgdesc="JavaScript interpreter and libraries - Version $_ffver"
-arch=(x86_64)
-url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-license=(MPL)
-depends=(gcc-libs readline zlib sh)
-makedepends=(python2 zip autoconf2.13 mercurial)
-_repo=https://hg.mozilla.org/mozilla-unified
-source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}esr_RELEASE"
-        bug1415202.patch
-        mozjs60-fix-soname.patch
-        mozjs52-include-configure-script.patch)
-sha256sums=('SKIP'
-            '0b410aa6ebd0236cd3ea524340c2da2235973a42cd0eaa90f7f394cd5bcbab95'
-            'c792837930defe27355941080e9b80ec1d45003c097e4707860acc13d43bc519'
-            'd91a89acd88bfc747a255050757a0c17139bf5c3508c2e1c3c6bb2056786a344')
-
-prepare() {
-  cd mozilla-unified
-  mkdir obj
-
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1479687
-  patch -Np1 -i ../bug1415202.patch
-
-  # https://salsa.debian.org/gnome-team/mozjs52/tree/debian/master/debian/patches
-  patch -Np1 -i ../mozjs60-fix-soname.patch
-  patch -Np1 -i ../mozjs52-include-configure-script.patch
-}
-
-build() {
-  local configure_args=(
-    --prefix=/usr
-    --disable-debug
-    --disable-debug-symbols
-    --disable-jemalloc
-    --disable-strip
-    --enable-hardening
-    --enable-linker=gold
-    --enable-optimize
-    --enable-posix-nspr-emulation
-    --enable-readline
-    --enable-release
-    --enable-shared-js
-    --enable-tests
-    --with-intl-api
-    --with-system-zlib
-    --without-system-icu
-  )
-
-  cd mozilla-unified/obj
-
-  export PYTHON=/usr/bin/python2
-
-  sh ../js/src/configure "${configure_args[@]}"
-  make
-}
-
-check() {
-  local jstests_extra_args=(
-    --format=none
-    --exclude-random
-  ) jittest_extra_args=(
-    --format=none
-    --timeout 300
-  ) jittest_test_args=(
-    basic
-  )
-
-  cd mozilla-unified/obj
-  make -C js/src check-jstests check-jit-test \
-    JSTESTS_EXTRA_ARGS="${jstests_extra_args[*]}" \
-    JITTEST_EXTRA_ARGS="${jittest_extra_args[*]}" \
-    JITTEST_TEST_ARGS="${jittest_test_args[*]}"
-}
-
-package() {
-  cd mozilla-unified/obj
-  make DESTDIR="$pkgdir" install
-  rm "$pkgdir"/usr/lib/*.ajs
-  find "$pkgdir"/usr/{lib/pkgconfig,include} -type f -exec chmod -c a-x {} +
-}
-
-# vim:set ts=2 sw=2 et:

Copied: js60/repos/extra-x86_64/PKGBUILD (from rev 352795, js60/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-05-09 14:23:31 UTC (rev 352796)
@@ -0,0 +1,88 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=js60
+pkgver=60.6.3
+pkgrel=1
+_ffver=${pkgver%%.*}
+pkgdesc="JavaScript interpreter and libraries - Version $_ffver"
+arch=(x86_64)
+url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
+license=(MPL)
+depends=(gcc-libs readline zlib sh)
+makedepends=(python2 zip autoconf2.13 mercurial)
+_repo=https://hg.mozilla.org/releases/mozilla-esr60
+source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}esr_RELEASE"
+        bug1415202.patch
+        mozjs60-fix-soname.patch
+        mozjs52-include-configure-script.patch)
+sha256sums=('SKIP'
+            '0b410aa6ebd0236cd3ea524340c2da2235973a42cd0eaa90f7f394cd5bcbab95'
+            'c792837930defe27355941080e9b80ec1d45003c097e4707860acc13d43bc519'
+            'd91a89acd88bfc747a255050757a0c17139bf5c3508c2e1c3c6bb2056786a344')
+
+prepare() {
+  cd mozilla-esr60
+  mkdir obj
+
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1479687
+  patch -Np1 -i ../bug1415202.patch
+
+  # https://salsa.debian.org/gnome-team/mozjs52/tree/debian/master/debian/patches
+  patch -Np1 -i ../mozjs60-fix-soname.patch
+  patch -Np1 -i ../mozjs52-include-configure-script.patch
+}
+
+build() {
+  local configure_args=(
+    --prefix=/usr
+    --disable-debug
+    --disable-debug-symbols
+    --disable-jemalloc
+    --disable-strip
+    --enable-hardening
+    --enable-linker=gold
+    --enable-optimize
+    --enable-posix-nspr-emulation
+    --enable-readline
+    --enable-release
+    --enable-shared-js
+    --enable-tests
+    --with-intl-api
+    --with-system-zlib
+    --without-system-icu
+  )
+
+  cd mozilla-esr60/obj
+
+  export PYTHON=/usr/bin/python2
+
+  sh ../js/src/configure "${configure_args[@]}"
+  make
+}
+
+check() {
+  local jstests_extra_args=(
+    --format=none
+    --exclude-random
+  ) jittest_extra_args=(
+    --format=none
+    --timeout 300
+  ) jittest_test_args=(
+    basic
+  )
+
+  cd mozilla-esr60/obj
+  make -C js/src check-jstests check-jit-test \
+    JSTESTS_EXTRA_ARGS="${jstests_extra_args[*]}" \
+    JITTEST_EXTRA_ARGS="${jittest_extra_args[*]}" \
+    JITTEST_TEST_ARGS="${jittest_test_args[*]}"
+}
+
+package() {
+  cd mozilla-esr60/obj
+  make DESTDIR="$pkgdir" install
+  rm "$pkgdir"/usr/lib/*.ajs
+  find "$pkgdir"/usr/{lib/pkgconfig,include} -type f -exec chmod -c a-x {} +
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: bug1415202.patch
===================================================================
--- bug1415202.patch	2019-05-09 14:23:12 UTC (rev 352795)
+++ bug1415202.patch	2019-05-09 14:23:31 UTC (rev 352796)
@@ -1,127 +0,0 @@
-# HG changeset patch
-# User André Bargull <andre.bargull at gmail.com>
-# Date 1510140221 28800
-#      Wed Nov 08 03:23:41 2017 -0800
-# Node ID 8bf5e7460a7c5ba3430b501d1659c469a862a929
-# Parent  60fd4a5b01ec70ded9ddfd560fd5be191b1c74b9
-Bug 1415202: Always use the equivalent year to determine the time zone offset and name. r=Waldo
-
-diff --git a/js/src/jsdate.cpp b/js/src/jsdate.cpp
---- a/js/src/jsdate.cpp
-+++ b/js/src/jsdate.cpp
-@@ -2348,22 +2348,26 @@ static PRMJTime ToPRMJTime(double localT
-   prtm.tm_isdst = (DaylightSavingTA(utcTime) != 0);
- 
-   return prtm;
- }
- 
- static size_t FormatTime(char* buf, int buflen, const char* fmt, double utcTime,
-                          double localTime) {
-   PRMJTime prtm = ToPRMJTime(localTime, utcTime);
--  int eqivalentYear = IsRepresentableAsTime32(utcTime)
-+
-+  // If an equivalent year was used to compute the date/time components, use
-+  // the same equivalent year to determine the time zone name and offset in
-+  // PRMJ_FormatTime(...).
-+  int timeZoneYear = IsRepresentableAsTime32(utcTime)
-                           ? prtm.tm_year
-                           : EquivalentYearForDST(prtm.tm_year);
-   int offsetInSeconds = (int)floor((localTime - utcTime) / msPerSecond);
- 
--  return PRMJ_FormatTime(buf, buflen, fmt, &prtm, eqivalentYear,
-+  return PRMJ_FormatTime(buf, buflen, fmt, &prtm, timeZoneYear,
-                          offsetInSeconds);
- }
- 
- enum class FormatSpec { DateTime, Date, Time };
- 
- static bool FormatDate(JSContext* cx, double utcTime, FormatSpec format,
-                        MutableHandleValue rval) {
-   JSString* str;
-diff --git a/js/src/vm/Time.cpp b/js/src/vm/Time.cpp
---- a/js/src/vm/Time.cpp
-+++ b/js/src/vm/Time.cpp
-@@ -242,17 +242,17 @@ static void PRMJ_InvalidParameterHandler
-                                          const wchar_t* file, unsigned int line,
-                                          uintptr_t pReserved) {
-   /* empty */
- }
- #endif
- 
- /* Format a time value into a buffer. Same semantics as strftime() */
- size_t PRMJ_FormatTime(char* buf, int buflen, const char* fmt,
--                       const PRMJTime* prtm, int equivalentYear,
-+                       const PRMJTime* prtm, int timeZoneYear,
-                        int offsetInSeconds) {
-   size_t result = 0;
- #if defined(XP_UNIX) || defined(XP_WIN)
-   struct tm a;
- #ifdef XP_WIN
-   _invalid_parameter_handler oldHandler;
- #ifndef __MINGW32__
-   int oldReportMode;
-@@ -275,39 +275,33 @@ size_t PRMJ_FormatTime(char* buf, int bu
-    */
- #if defined(HAVE_LOCALTIME_R) && defined(HAVE_TM_ZONE_TM_GMTOFF)
-   char emptyTimeZoneId[] = "";
-   {
-     /*
-      * Fill out |td| to the time represented by |prtm|, leaving the
-      * timezone fields zeroed out. localtime_r will then fill in the
-      * timezone fields for that local time according to the system's
--     * timezone parameters.
-+     * timezone parameters. Use |timeZoneYear| for the year to ensure the
-+     * time zone name matches the time zone offset used by the caller.
-      */
-     struct tm td;
-     memset(&td, 0, sizeof(td));
-     td.tm_sec = prtm->tm_sec;
-     td.tm_min = prtm->tm_min;
-     td.tm_hour = prtm->tm_hour;
-     td.tm_mday = prtm->tm_mday;
-     td.tm_mon = prtm->tm_mon;
-     td.tm_wday = prtm->tm_wday;
--    td.tm_year = prtm->tm_year - 1900;
-+    td.tm_year = timeZoneYear - 1900;
-     td.tm_yday = prtm->tm_yday;
-     td.tm_isdst = prtm->tm_isdst;
- 
-     time_t t = mktime(&td);
- 
--    // If |prtm| cannot be represented in |time_t| the year is probably
--    // out of range, try again with the DST equivalent year.
--    if (t == static_cast<time_t>(-1)) {
--      td.tm_year = equivalentYear - 1900;
--      t = mktime(&td);
--    }
--
-     // If either mktime or localtime_r failed, fill in the fallback time
-     // zone offset |offsetInSeconds| and set the time zone identifier to
-     // the empty string.
-     if (t != static_cast<time_t>(-1) && localtime_r(&t, &td)) {
-       a.tm_gmtoff = td.tm_gmtoff;
-       a.tm_zone = td.tm_zone;
-     } else {
-       a.tm_gmtoff = offsetInSeconds;
-diff --git a/js/src/vm/Time.h b/js/src/vm/Time.h
---- a/js/src/vm/Time.h
-+++ b/js/src/vm/Time.h
-@@ -44,17 +44,17 @@ inline void PRMJ_NowInit() {}
- #ifdef XP_WIN
- extern void PRMJ_NowShutdown();
- #else
- inline void PRMJ_NowShutdown() {}
- #endif
- 
- /* Format a time value into a buffer. Same semantics as strftime() */
- extern size_t PRMJ_FormatTime(char* buf, int buflen, const char* fmt,
--                              const PRMJTime* tm, int equivalentYear,
-+                              const PRMJTime* tm, int timeZoneYear,
-                               int offsetInSeconds);
- 
- /**
-  * Requesting the number of cycles from the CPU.
-  *
-  * `rdtsc`, or Read TimeStamp Cycle, is an instruction provided by
-  * x86-compatible CPUs that lets processes request the number of
-  * cycles spent by the CPU executing instructions since the CPU was

Copied: js60/repos/extra-x86_64/bug1415202.patch (from rev 352795, js60/trunk/bug1415202.patch)
===================================================================
--- bug1415202.patch	                        (rev 0)
+++ bug1415202.patch	2019-05-09 14:23:31 UTC (rev 352796)
@@ -0,0 +1,127 @@
+# HG changeset patch
+# User André Bargull <andre.bargull at gmail.com>
+# Date 1510140221 28800
+#      Wed Nov 08 03:23:41 2017 -0800
+# Node ID 8bf5e7460a7c5ba3430b501d1659c469a862a929
+# Parent  60fd4a5b01ec70ded9ddfd560fd5be191b1c74b9
+Bug 1415202: Always use the equivalent year to determine the time zone offset and name. r=Waldo
+
+diff --git a/js/src/jsdate.cpp b/js/src/jsdate.cpp
+--- a/js/src/jsdate.cpp
++++ b/js/src/jsdate.cpp
+@@ -2348,22 +2348,26 @@ static PRMJTime ToPRMJTime(double localT
+   prtm.tm_isdst = (DaylightSavingTA(utcTime) != 0);
+ 
+   return prtm;
+ }
+ 
+ static size_t FormatTime(char* buf, int buflen, const char* fmt, double utcTime,
+                          double localTime) {
+   PRMJTime prtm = ToPRMJTime(localTime, utcTime);
+-  int eqivalentYear = IsRepresentableAsTime32(utcTime)
++
++  // If an equivalent year was used to compute the date/time components, use
++  // the same equivalent year to determine the time zone name and offset in
++  // PRMJ_FormatTime(...).
++  int timeZoneYear = IsRepresentableAsTime32(utcTime)
+                           ? prtm.tm_year
+                           : EquivalentYearForDST(prtm.tm_year);
+   int offsetInSeconds = (int)floor((localTime - utcTime) / msPerSecond);
+ 
+-  return PRMJ_FormatTime(buf, buflen, fmt, &prtm, eqivalentYear,
++  return PRMJ_FormatTime(buf, buflen, fmt, &prtm, timeZoneYear,
+                          offsetInSeconds);
+ }
+ 
+ enum class FormatSpec { DateTime, Date, Time };
+ 
+ static bool FormatDate(JSContext* cx, double utcTime, FormatSpec format,
+                        MutableHandleValue rval) {
+   JSString* str;
+diff --git a/js/src/vm/Time.cpp b/js/src/vm/Time.cpp
+--- a/js/src/vm/Time.cpp
++++ b/js/src/vm/Time.cpp
+@@ -242,17 +242,17 @@ static void PRMJ_InvalidParameterHandler
+                                          const wchar_t* file, unsigned int line,
+                                          uintptr_t pReserved) {
+   /* empty */
+ }
+ #endif
+ 
+ /* Format a time value into a buffer. Same semantics as strftime() */
+ size_t PRMJ_FormatTime(char* buf, int buflen, const char* fmt,
+-                       const PRMJTime* prtm, int equivalentYear,
++                       const PRMJTime* prtm, int timeZoneYear,
+                        int offsetInSeconds) {
+   size_t result = 0;
+ #if defined(XP_UNIX) || defined(XP_WIN)
+   struct tm a;
+ #ifdef XP_WIN
+   _invalid_parameter_handler oldHandler;
+ #ifndef __MINGW32__
+   int oldReportMode;
+@@ -275,39 +275,33 @@ size_t PRMJ_FormatTime(char* buf, int bu
+    */
+ #if defined(HAVE_LOCALTIME_R) && defined(HAVE_TM_ZONE_TM_GMTOFF)
+   char emptyTimeZoneId[] = "";
+   {
+     /*
+      * Fill out |td| to the time represented by |prtm|, leaving the
+      * timezone fields zeroed out. localtime_r will then fill in the
+      * timezone fields for that local time according to the system's
+-     * timezone parameters.
++     * timezone parameters. Use |timeZoneYear| for the year to ensure the
++     * time zone name matches the time zone offset used by the caller.
+      */
+     struct tm td;
+     memset(&td, 0, sizeof(td));
+     td.tm_sec = prtm->tm_sec;
+     td.tm_min = prtm->tm_min;
+     td.tm_hour = prtm->tm_hour;
+     td.tm_mday = prtm->tm_mday;
+     td.tm_mon = prtm->tm_mon;
+     td.tm_wday = prtm->tm_wday;
+-    td.tm_year = prtm->tm_year - 1900;
++    td.tm_year = timeZoneYear - 1900;
+     td.tm_yday = prtm->tm_yday;
+     td.tm_isdst = prtm->tm_isdst;
+ 
+     time_t t = mktime(&td);
+ 
+-    // If |prtm| cannot be represented in |time_t| the year is probably
+-    // out of range, try again with the DST equivalent year.
+-    if (t == static_cast<time_t>(-1)) {
+-      td.tm_year = equivalentYear - 1900;
+-      t = mktime(&td);
+-    }
+-
+     // If either mktime or localtime_r failed, fill in the fallback time
+     // zone offset |offsetInSeconds| and set the time zone identifier to
+     // the empty string.
+     if (t != static_cast<time_t>(-1) && localtime_r(&t, &td)) {
+       a.tm_gmtoff = td.tm_gmtoff;
+       a.tm_zone = td.tm_zone;
+     } else {
+       a.tm_gmtoff = offsetInSeconds;
+diff --git a/js/src/vm/Time.h b/js/src/vm/Time.h
+--- a/js/src/vm/Time.h
++++ b/js/src/vm/Time.h
+@@ -44,17 +44,17 @@ inline void PRMJ_NowInit() {}
+ #ifdef XP_WIN
+ extern void PRMJ_NowShutdown();
+ #else
+ inline void PRMJ_NowShutdown() {}
+ #endif
+ 
+ /* Format a time value into a buffer. Same semantics as strftime() */
+ extern size_t PRMJ_FormatTime(char* buf, int buflen, const char* fmt,
+-                              const PRMJTime* tm, int equivalentYear,
++                              const PRMJTime* tm, int timeZoneYear,
+                               int offsetInSeconds);
+ 
+ /**
+  * Requesting the number of cycles from the CPU.
+  *
+  * `rdtsc`, or Read TimeStamp Cycle, is an instruction provided by
+  * x86-compatible CPUs that lets processes request the number of
+  * cycles spent by the CPU executing instructions since the CPU was

Deleted: mozjs52-include-configure-script.patch
===================================================================
--- mozjs52-include-configure-script.patch	2019-05-09 14:23:12 UTC (rev 352795)
+++ mozjs52-include-configure-script.patch	2019-05-09 14:23:31 UTC (rev 352796)
@@ -1,63 +0,0 @@
-From 4a06a1a6a71293decb83aee7adb74bc709493106 Mon Sep 17 00:00:00 2001
-From: Philip Chimento <philip.chimento at gmail.com>
-Date: Wed, 5 Jul 2017 22:57:09 -0700
-Subject: [PATCH] build: Include configure script, be nicer about options
-
-A configure script is not included in the SpiderMonkey tarball by
-default. Also, we have to account for JHbuild passing extra unknown
-options like --disable-Werror.
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=1379540
----
- js/src/configure                               | 9 +++++++++
- python/mozbuild/mozbuild/configure/__init__.py | 2 +-
- python/mozbuild/mozbuild/configure/options.py  | 6 +++++-
- 3 files changed, 15 insertions(+), 2 deletions(-)
- create mode 100755 js/src/configure
-
-diff --git a/js/src/configure b/js/src/configure
-new file mode 100755
-index 00000000..f1ef8c49
---- /dev/null
-+++ b/js/src/configure
-@@ -0,0 +1,9 @@
-+#!/bin/sh
-+
-+SRCDIR=$(dirname $0)
-+TOPSRCDIR="$SRCDIR"/../..
-+export OLD_CONFIGURE="$SRCDIR"/old-configure
-+
-+set -- "$@" --enable-project=js
-+
-+which python2.7 > /dev/null && exec python2.7 "$TOPSRCDIR/configure.py" "$@" || exec python "$TOPSRCDIR/configure.py" "$@"
-diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py
-index 0fe640ca..09b460d3 100644
---- a/python/mozbuild/mozbuild/configure/__init__.py
-+++ b/python/mozbuild/mozbuild/configure/__init__.py
-@@ -356,7 +356,7 @@ def run(self, path=None):
-         # All options should have been removed (handled) by now.
-         for arg in self._helper:
-             without_value = arg.split('=', 1)[0]
--            raise InvalidOptionError('Unknown option: %s' % without_value)
-+            print('Ignoring', without_value, ': Unknown option')
- 
-         # Run the execution queue
-         for func, args in self._execution_queue:
-diff --git a/python/mozbuild/mozbuild/configure/options.py b/python/mozbuild/mozbuild/configure/options.py
-index 4310c862..15bfe425 100644
---- a/python/mozbuild/mozbuild/configure/options.py
-+++ b/python/mozbuild/mozbuild/configure/options.py
-@@ -402,7 +402,11 @@ def __init__(self, environ=os.environ, argv=sys.argv):
- 
-     def add(self, arg, origin='command-line', args=None):
-         assert origin != 'default'
--        prefix, name, values = Option.split_option(arg)
-+        try:
-+            prefix, name, values = Option.split_option(arg)
-+        except InvalidOptionError as e:
-+            print('Ignoring', arg, ':', e)
-+            return
-         if args is None:
-             args = self._extra_args
-         if args is self._extra_args and name in self._extra_args:
-

Copied: js60/repos/extra-x86_64/mozjs52-include-configure-script.patch (from rev 352795, js60/trunk/mozjs52-include-configure-script.patch)
===================================================================
--- mozjs52-include-configure-script.patch	                        (rev 0)
+++ mozjs52-include-configure-script.patch	2019-05-09 14:23:31 UTC (rev 352796)
@@ -0,0 +1,63 @@
+From 4a06a1a6a71293decb83aee7adb74bc709493106 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento at gmail.com>
+Date: Wed, 5 Jul 2017 22:57:09 -0700
+Subject: [PATCH] build: Include configure script, be nicer about options
+
+A configure script is not included in the SpiderMonkey tarball by
+default. Also, we have to account for JHbuild passing extra unknown
+options like --disable-Werror.
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1379540
+---
+ js/src/configure                               | 9 +++++++++
+ python/mozbuild/mozbuild/configure/__init__.py | 2 +-
+ python/mozbuild/mozbuild/configure/options.py  | 6 +++++-
+ 3 files changed, 15 insertions(+), 2 deletions(-)
+ create mode 100755 js/src/configure
+
+diff --git a/js/src/configure b/js/src/configure
+new file mode 100755
+index 00000000..f1ef8c49
+--- /dev/null
++++ b/js/src/configure
+@@ -0,0 +1,9 @@
++#!/bin/sh
++
++SRCDIR=$(dirname $0)
++TOPSRCDIR="$SRCDIR"/../..
++export OLD_CONFIGURE="$SRCDIR"/old-configure
++
++set -- "$@" --enable-project=js
++
++which python2.7 > /dev/null && exec python2.7 "$TOPSRCDIR/configure.py" "$@" || exec python "$TOPSRCDIR/configure.py" "$@"
+diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py
+index 0fe640ca..09b460d3 100644
+--- a/python/mozbuild/mozbuild/configure/__init__.py
++++ b/python/mozbuild/mozbuild/configure/__init__.py
+@@ -356,7 +356,7 @@ def run(self, path=None):
+         # All options should have been removed (handled) by now.
+         for arg in self._helper:
+             without_value = arg.split('=', 1)[0]
+-            raise InvalidOptionError('Unknown option: %s' % without_value)
++            print('Ignoring', without_value, ': Unknown option')
+ 
+         # Run the execution queue
+         for func, args in self._execution_queue:
+diff --git a/python/mozbuild/mozbuild/configure/options.py b/python/mozbuild/mozbuild/configure/options.py
+index 4310c862..15bfe425 100644
+--- a/python/mozbuild/mozbuild/configure/options.py
++++ b/python/mozbuild/mozbuild/configure/options.py
+@@ -402,7 +402,11 @@ def __init__(self, environ=os.environ, argv=sys.argv):
+ 
+     def add(self, arg, origin='command-line', args=None):
+         assert origin != 'default'
+-        prefix, name, values = Option.split_option(arg)
++        try:
++            prefix, name, values = Option.split_option(arg)
++        except InvalidOptionError as e:
++            print('Ignoring', arg, ':', e)
++            return
+         if args is None:
+             args = self._extra_args
+         if args is self._extra_args and name in self._extra_args:
+

Deleted: mozjs60-fix-soname.patch
===================================================================
--- mozjs60-fix-soname.patch	2019-05-09 14:23:12 UTC (rev 352795)
+++ mozjs60-fix-soname.patch	2019-05-09 14:23:31 UTC (rev 352796)
@@ -1,25 +0,0 @@
-diff --git i/js/src/build/Makefile.in w/js/src/build/Makefile.in
-index ee19104e0ef5..a0f06fd35a18 100644
---- i/js/src/build/Makefile.in
-+++ w/js/src/build/Makefile.in
-@@ -89,6 +89,8 @@ ifneq (,$(REAL_LIBRARY))
- endif
- ifneq (,$(SHARED_LIBRARY))
- 	$(SYSINSTALL) $(SHARED_LIBRARY) $(DESTDIR)$(libdir)
-+	mv -f $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).0
-+	ln -s $(SHARED_LIBRARY).0 $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
- ifeq ($(OS_ARCH),Darwin)
- 	install_name_tool -id $(abspath $(libdir)/$(SHARED_LIBRARY)) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
- endif
-diff --git i/js/src/build/moz.build w/js/src/build/moz.build
-index a7f5fa4ce8eb..726687c13fb0 100644
---- i/js/src/build/moz.build
-+++ w/js/src/build/moz.build
-@@ -23,6 +23,7 @@ if not CONFIG['JS_STANDALONE']:
- if CONFIG['JS_SHARED_LIBRARY']:
-     GeckoSharedLibrary('js', linkage=None)
-     SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME']
-+    LDFLAGS += ['-Wl,-soname,lib{}.so.0'.format(SHARED_LIBRARY_NAME)]
- else:
-     Library('js')
- 

Copied: js60/repos/extra-x86_64/mozjs60-fix-soname.patch (from rev 352795, js60/trunk/mozjs60-fix-soname.patch)
===================================================================
--- mozjs60-fix-soname.patch	                        (rev 0)
+++ mozjs60-fix-soname.patch	2019-05-09 14:23:31 UTC (rev 352796)
@@ -0,0 +1,25 @@
+diff --git i/js/src/build/Makefile.in w/js/src/build/Makefile.in
+index ee19104e0ef5..a0f06fd35a18 100644
+--- i/js/src/build/Makefile.in
++++ w/js/src/build/Makefile.in
+@@ -89,6 +89,8 @@ ifneq (,$(REAL_LIBRARY))
+ endif
+ ifneq (,$(SHARED_LIBRARY))
+ 	$(SYSINSTALL) $(SHARED_LIBRARY) $(DESTDIR)$(libdir)
++	mv -f $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).0
++	ln -s $(SHARED_LIBRARY).0 $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
+ ifeq ($(OS_ARCH),Darwin)
+ 	install_name_tool -id $(abspath $(libdir)/$(SHARED_LIBRARY)) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
+ endif
+diff --git i/js/src/build/moz.build w/js/src/build/moz.build
+index a7f5fa4ce8eb..726687c13fb0 100644
+--- i/js/src/build/moz.build
++++ w/js/src/build/moz.build
+@@ -23,6 +23,7 @@ if not CONFIG['JS_STANDALONE']:
+ if CONFIG['JS_SHARED_LIBRARY']:
+     GeckoSharedLibrary('js', linkage=None)
+     SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME']
++    LDFLAGS += ['-Wl,-soname,lib{}.so.0'.format(SHARED_LIBRARY_NAME)]
+ else:
+     Library('js')
+ 


More information about the arch-commits mailing list