--- 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')
+ if self._help:
+ self._logger.warning(msg)
+ else:
+- raise InvalidOptionError(msg)
++ print(msg)
# Run the execution queue
for func, args in self._execution_queue:
# Conditional build:
%bcond_without tests # tests build
-Summary: SpiderMonkey 60 - JavaScript implementation
-Summary(pl.UTF-8): SpiderMonkey 60 - implementacja języka JavaScript
-Name: mozjs60
-Version: 60.9.0
+Summary: SpiderMonkey 68 - JavaScript implementation
+Summary(pl.UTF-8): SpiderMonkey 68 - implementacja języka JavaScript
+Name: mozjs68
+Version: 68.7.0
Release: 1
License: MPL v2.0
Group: Libraries
#Source0: http://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-%{version}.tar.bz2
Source0: http://ftp.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.xz
-# Source0-md5: 69a0be9ce695e5dc4941ed0c78ef00c2
+# Source0-md5: a3e8676285f4fd7834ac16b1fee4e20c
Patch0: copy-headers.patch
Patch1: system-virtualenv.patch
Patch2: include-configure-script.patch
%files
%defattr(644,root,root,755)
%doc js/src/README.html
-%attr(755,root,root) %{_bindir}/js60
-%attr(755,root,root) %{_libdir}/libmozjs-60.so
+%attr(755,root,root) %{_bindir}/js68
+%attr(755,root,root) %{_libdir}/libmozjs-68.so
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/js60-config
-%{_includedir}/mozjs-60
-%{_pkgconfigdir}/mozjs-60.pc
+%attr(755,root,root) %{_bindir}/js68-config
+%{_includedir}/mozjs-68
+%{_pkgconfigdir}/mozjs-68.pc
endianness = 'little'
elif cpu in ('s390', 's390x'):
canonical_cpu = cpu
---- firefox-60.7.0/js/src/jsmath.cpp.orig 2019-05-24 22:04:38.196451155 +0200
-+++ firefox-60.7.0/js/src/jsmath.cpp 2019-05-24 22:10:43.717804289 +0200
+--- firefox-60.7.0/mfbt/RandomNum.cpp.orig 2019-05-24 22:04:38.196451155 +0200
++++ firefox-60.7.0/mfbt/RandomNum.cpp 2019-05-24 22:10:43.717804289 +0200
@@ -58,7 +58,9 @@
// Older glibc versions don't define SYS_getrandom, so we define it here if
// it's not available. See bug 995069.
--#if defined(__x86_64__)
-+#if defined(__x86_64__) && defined(__ILP32__)
-+#define GETRANDOM_NR (__X32_SYSCALL_BIT + 318)
-+#elif defined(__x86_64__)
- #define GETRANDOM_NR 318
- #elif defined(__i386__)
- #define GETRANDOM_NR 355
+-# if defined(__x86_64__)
++# if defined(__x86_64__) && defined(__ILP32__)
++# define GETRANDOM_NR (__X32_SYSCALL_BIT + 318)
++# elif defined(__x86_64__)
+ # define GETRANDOM_NR 318
+ # elif defined(__i386__)
+ # define GETRANDOM_NR 355
diff -ur mozjs-60.1.0/python/mozbuild/mozbuild/configure/constants.py mozjs-60.1.0-x32/python/mozbuild/mozbuild/configure/constants.py
--- mozjs-60.1.0/python/mozbuild/mozbuild/configure/constants.py 2018-06-19 00:24:03.000000000 +0200
+++ mozjs-60.1.0-x32/python/mozbuild/mozbuild/configure/constants.py 2019-03-31 10:39:21.792681467 +0200