The package rpms/mozjs52.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/mozjs52.git/commit/?id=c4c289089f5b0....
Change: +%ifarch %{ix86} x86_64 %{arm} aarch64 %{power64}
Thanks.
Full change: ============
commit 92550aef5001351d4a34b005134eecece147cd30 Author: Kalev Lember klember@redhat.com Date: Fri May 11 12:05:39 2018 +0200
Disable JS Helper threads on ppc64le
https://bugzilla.redhat.com/show_bug.cgi?id=1523121
diff --git a/disable-extra-threads.patch b/disable-extra-threads.patch new file mode 100644 index 0000000..8e4e7fb --- /dev/null +++ b/disable-extra-threads.patch @@ -0,0 +1,21 @@ +diff -up firefox-52.6.0esr/js/src/vm/Runtime.cpp.disable-extra-threads firefox-52.6.0esr/js/src/vm/Runtime.cpp +--- firefox-52.6.0esr/js/src/vm/Runtime.cpp.disable-extra-threads 2018-02-08 10:16:13.453828939 -0500 ++++ firefox-52.6.0esr/js/src/vm/Runtime.cpp 2018-02-08 10:23:31.283458826 -0500 +@@ -283,6 +283,17 @@ JSRuntime::init(uint32_t maxbytes, uint3 + ownerThreadNative_ = (size_t)pthread_self(); + #endif + ++ const char* enable_js_helper_threads; ++ enable_js_helper_threads = getenv("GJS_ENABLE_JS_HELPER_THREADS"); ++ ++#if defined(__PPC64__) && defined (__LITTLE_ENDIAN__) ++ if (enable_js_helper_threads == NULL) ++ js::DisableExtraThreads(); ++#endif ++ ++ if (enable_js_helper_threads != NULL && enable_js_helper_threads[0] == '0') ++ js::DisableExtraThreads(); ++ + if (!mainThread.init()) + return false; + diff --git a/mozjs52.spec b/mozjs52.spec index 314c36f..9df826e 100644 --- a/mozjs52.spec +++ b/mozjs52.spec @@ -23,6 +23,10 @@ Source0: https://ftp.mozilla.org/pub/firefox/releases/%%7Bversion%7Desr/sourc Patch0001: fix-soname.patch Patch0002: copy-headers.patch
+# Disable JS Helper threads on ppc64le +# https://bugzilla.redhat.com/show_bug.cgi?id=1523121 +Patch0003: disable-extra-threads.patch + # Patches from https://github.com/ptomato/mozjs / Debian mozjs52_52.3.1-4.debian.tar.xz Patch0101: disable-mozglue.patch Patch0104: include-configure-script.patch @@ -67,6 +71,7 @@ developing applications that use %{name}. pushd ../.. %patch0001 -p1 %patch0002 -p1 +%patch0003 -p1
%patch0101 -p1 %patch0104 -p1 @@ -173,6 +178,7 @@ ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so * Fri May 11 2018 Kalev Lember klember@redhat.com - 52.8.0-1 - Update to 52.8.0 - Fix the build on ppc +- Disable JS Helper threads on ppc64le (#1523121)
* Sat Apr 07 2018 Kalev Lember klember@redhat.com - 52.7.3-1 - Update to 52.7.3
commit c4c289089f5b075f141676b5a48c51e54d2a0c34 Author: Kalev Lember klember@redhat.com Date: Fri May 11 11:10:50 2018 +0200
Fix the build on ppc
... and sync xulrunner-24.0-jemalloc-ppc.patch with firefox.
diff --git a/mozjs52.spec b/mozjs52.spec index 71e0354..314c36f 100644 --- a/mozjs52.spec +++ b/mozjs52.spec @@ -1,5 +1,10 @@ %global major 52
+# Require libatomic for ppc +%ifarch ppc +%global system_libatomic 1 +%endif + # Big endian platforms %ifarch ppc ppc64 s390 s390x %global big_endian 1 @@ -36,6 +41,9 @@ BuildRequires: pkgconfig(zlib) BuildRequires: python2-devel BuildRequires: readline-devel BuildRequires: /usr/bin/zip +%if 0%{?system_libatomic} +BuildRequires: libatomic +%endif
# Firefox does not allow to build with system version of jemalloc Provides: bundled(jemalloc) = 4.3.1 @@ -134,7 +142,7 @@ ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so %check # Run SpiderMonkey tests %{__python2} tests/jstests.py -d -s -t 1800 --no-progress ../../js/src/js/src/shell/js \ -%ifnarch s390 s390x %{power64} +%ifarch %{ix86} x86_64 %{arm} aarch64 ; %else || : @@ -142,7 +150,7 @@ ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so
# Run basic JIT tests %{__python2} jit-test/jit_test.py -s -t 1800 --no-progress ../../js/src/js/src/shell/js basic \ -%ifnarch s390 s390x +%ifarch %{ix86} x86_64 %{arm} aarch64 %{power64} ; %else || : @@ -164,6 +172,7 @@ ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so %changelog * Fri May 11 2018 Kalev Lember klember@redhat.com - 52.8.0-1 - Update to 52.8.0 +- Fix the build on ppc
* Sat Apr 07 2018 Kalev Lember klember@redhat.com - 52.7.3-1 - Update to 52.7.3 diff --git a/xulrunner-24.0-jemalloc-ppc.patch b/xulrunner-24.0-jemalloc-ppc.patch index b2aaae6..d0c3d8c 100644 --- a/xulrunner-24.0-jemalloc-ppc.patch +++ b/xulrunner-24.0-jemalloc-ppc.patch @@ -1,12 +1,12 @@ -diff -up firefox-48.0/memory/mozjemalloc/jemalloc.c.jemalloc-ppc firefox-48.0/memory/mozjemalloc/jemalloc.c ---- firefox-48.0/memory/mozjemalloc/jemalloc.c.jemalloc-ppc 2016-07-26 10:51:46.385434384 +0200 -+++ firefox-48.0/memory/mozjemalloc/jemalloc.c 2016-07-26 10:53:49.061023106 +0200 -@@ -1090,7 +1090,7 @@ static const bool config_recycle = false +diff -up mozilla-aurora/memory/mozjemalloc/jemalloc.c.jemalloc-ppc.patch mozilla-aurora/memory/mozjemalloc/jemalloc.c +--- mozilla-aurora/memory/mozjemalloc/jemalloc.c.jemalloc-ppc.patch 2016-11-18 08:56:32.242742746 +0100 ++++ mozilla-aurora/memory/mozjemalloc/jemalloc.c 2016-11-18 08:59:51.809071876 +0100 +@@ -1096,7 +1096,7 @@ static const bool config_recycle = false * controlling the malloc behavior are defined as compile-time constants * for best performance and cannot be altered at runtime. */ -#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && !defined(__aarch64__) -+#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && !defined(__aarch64__) && !(defined(__powerpc__)) ++#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && !defined(__aarch64__) && !defined(__powerpc__) #define MALLOC_STATIC_SIZES 1 #endif