diff --git a/add-sw_64-support.patch b/add-sw_64-support.patch index d67b65f41b1e1bd18e8f9688b61f55aa6c60fddc..4fc92ac1f12989973f8632b2b406283b6e93eed5 100644 --- a/add-sw_64-support.patch +++ b/add-sw_64-support.patch @@ -7,7 +7,7 @@ diff -auNr firefox-102.9.0/build/autoconf/config.guess firefox-102.9.0.sw/build/ ;; + sw_64*:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC -+ exit ;; ++ ;; tile*:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; @@ -156,7 +156,7 @@ diff -auNr firefox-102.9.0/modules/freetype2/builds/unix/config.guess firefox-10 ;; + sw_64*:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC -+ exit ;; ++ ;; tile*:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; diff --git a/mozjs102.spec b/mozjs102.spec index 1540a9d8e2e4e0cd216e2d2ed517c0661880a7e7..7a8ca31aff848178700dfa7b7c12f04d9548a753 100644 --- a/mozjs102.spec +++ b/mozjs102.spec @@ -23,7 +23,7 @@ Name: mozjs%{major} Version: 102.9.0 -Release: 8 +Release: 9 Summary: SpiderMonkey JavaScript library License: MPL-2.0 AND Apache-2.0 AND BSD-3-Clause AND BSD-2-Clause AND MIT AND GPL-3.0-or-later URL: https://hg.mozilla.org/releases/mozilla-esr102 @@ -139,9 +139,12 @@ export CARGO_PROFILE_RELEASE_LTO=true %endif # Use bundled autoconf +export CC="%{__cc}" +export CXX="%{__cxx}" export M4=m4 export AWK=awk export AC_MACRODIR=%{_builddir}/firefox-%{version}/build/autoconf/ +export CC_TYPE="%{?toolchain}%{!?toolchain:gcc}" sh ../../build/autoconf/autoconf.sh --localdir=%{_builddir}/firefox-%{version}/js/src configure.in > configure chmod +x configure @@ -252,6 +255,10 @@ ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so %{_includedir}/mozjs-%{major}/ %changelog +* Mon Jun 23 2025 Funda Wang - 102.9.0-9 +- set CC and CXX so that clang won't be selected automatically +- fix compilation errors in sw_64 support + * Tue Mar 11 2025 Funda Wang - 102.9.0-8 - fix build with icu 76