Compare commits

...

14 Commits

Author SHA1 Message Date
b141170f5b
Merge remote-tracking branch 'up/main' into main-riscv64
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2024-08-01 09:54:21 +03:00
Fedora Release Engineering
27bdea4f66 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-18 18:42:54 +00:00
František Zatloukal
0efa8f1797 mozjs115-115.12.0 (RHBZ#2264868) 2024-06-12 18:50:49 +02:00
František Zatloukal
7e91920bb8 Re-enable lto on aarch64 2024-06-12 18:09:47 +02:00
František Zatloukal
2529838aad tests: Replace pipes with shlex for Python 3.13 2024-06-12 18:09:12 +02:00
František Zatloukal
35fbe3fd5f Adjust file paths 2024-06-12 15:53:53 +02:00
František Zatloukal
16033c6f96 Adjust known failures 2024-06-11 16:06:15 +02:00
František Zatloukal
b0f7540df3 spec cleanup 2024-06-11 16:03:13 +02:00
František Zatloukal
3e92ba10d6 mozjs115-115.7.0 (fixes RHBZ#2261827 and RHBZ#2259665) 2024-02-05 19:24:53 +01:00
Fedora Release Engineering
677d2686ee Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-25 08:08:57 +00:00
Fedora Release Engineering
6466d9be47 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-21 08:42:21 +00:00
be2304e828
Merge remote-tracking branch 'up/main' into main-riscv64
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2023-12-30 18:45:30 +02:00
František Zatloukal
03b2fe75af mozjs115-115.6.0 (Fixes RHBZ#2250695) 2023-12-21 18:16:02 +01:00
0e7d87da05
Add support for riscv64
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2023-12-05 10:24:11 +02:00
5 changed files with 95 additions and 17 deletions

3
.gitignore vendored
View File

@ -2,3 +2,6 @@
/firefox-115.2.0esr.source.tar.xz
/firefox-115.3.0esr.source.tar.xz
/firefox-115.3.1esr.source.tar.xz
/firefox-115.6.0esr.source.tar.xz
/firefox-115.7.0esr.source.tar.xz
/firefox-115.12.0esr.source.tar.xz

View File

@ -1,8 +1,43 @@
non262/Intl/available-locales-supported.js
non262/Intl/available-locales-resolved.js
non262/Intl/supportedValuesOf-timeZones-canonical.js
non262/Intl/available-locales-supported.js
non262/Intl/Collator/big5han-gb2312han.js
non262/Intl/Collator/implicithan.js
non262/Intl/DateTimeFormat/fractional-second-digits-append-item.js
non262/Intl/DateTimeFormat/day-period-hour-cycle.js
non262/Intl/DateTimeFormat/timeZone_backzone.js
non262/Intl/DateTimeFormat/fractional-second-digits-append-item.js
non262/Intl/DateTimeFormat/related-year.js
non262/Intl/DateTimeFormat/timeZone_backzone.js
non262/Intl/DateTimeFormat/timeZone_version.js
non262/Intl/DisplayNames/calendar.js
non262/Intl/DisplayNames/currency.js
non262/Intl/DisplayNames/language-dialect.js
non262/Intl/ListFormat/conjunction-type.js
non262/Intl/Locale/likely-subtags-generated.js
non262/Intl/Locale/likely-subtags.js
non262/Intl/supportedValuesOf-timeZones-canonical.js
non262/Intl/supportedValuesOf-timeZones.js
test262/built-ins/RegExp/property-escapes/generated/Alphabetic.js
test262/built-ins/RegExp/property-escapes/generated/Assigned.js
test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Letter.js
test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Other_Letter.js
test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Other_Symbol.js
test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Other.js
test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Symbol.js
test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Unassigned.js
test262/built-ins/RegExp/property-escapes/generated/Grapheme_Base.js
test262/built-ins/RegExp/property-escapes/generated/ID_Continue.js
test262/built-ins/RegExp/property-escapes/generated/ID_Start.js
test262/built-ins/RegExp/property-escapes/generated/Ideographic.js
test262/built-ins/RegExp/property-escapes/generated/IDS_Binary_Operator.js
test262/built-ins/RegExp/property-escapes/generated/Script_-_Common.js
test262/built-ins/RegExp/property-escapes/generated/Script_-_Han.js
test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Common.js
test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Han.js
test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Malayalam.js
test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Sharada.js
test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Sinhala.js
test262/built-ins/RegExp/property-escapes/generated/Sentence_Terminal.js
test262/built-ins/RegExp/property-escapes/generated/Unified_Ideograph.js
test262/built-ins/RegExp/property-escapes/generated/XID_Continue.js
test262/built-ins/RegExp/property-escapes/generated/XID_Start.js
test262/intl402/Intl/supportedValuesOf/timeZones-accepted-by-DateTimeFormat.js
test262/intl402/Locale/likely-subtags.js

View File

@ -1,10 +1,18 @@
%global major 115
# LTO - Enable in Release builds, but consider disabling for development as it increases compile time
%ifnarch riscv64
%global build_with_lto 1
%else
%global build_with_lto 0
%endif
# Require tests to pass?
%ifnarch riscv64
%global require_tests 1
%else
%global require_tests 0
%endif
%if 0%{?build_with_lto}
# LTO is the default
@ -18,8 +26,8 @@
%endif
Name: mozjs%{major}
Version: 115.4.0
Release: %autorelease
Version: 115.12.0
Release: %autorelease -e 0.riscv64
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
@ -55,6 +63,9 @@ Patch20: spidermonkey_checks_disable.patch
# s390x/ppc64 fixes
Patch21: 0001-Skip-failing-tests-on-ppc64-and-s390x.patch
# Tests Fixes
Patch30: tests-Replace-pipes-with-shlex-for-Python-3.13.patch
BuildRequires: cargo
%if !0%{?rhel}
BuildRequires: ccache
@ -95,10 +106,7 @@ The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
%autosetup -n firefox-%{version}/js/src -N
pushd ../..
%autopatch -p1
%autosetup -n firefox-%{version} -p1
# Purge the bundled six library incompatible with Python 3.12
rm third_party/python/six/six.py
@ -120,8 +128,6 @@ rm -rf js/src/devtools/automation/variants/
rm -rf js/src/octane/
rm -rf js/src/ctypes/libffi/
popd
%build
%if 0%{?build_with_lto}
# https://github.com/ptomato/mozjs/commit/36bb7982b41e0ef9a65f7174252ab996cd6777bd
@ -131,11 +137,11 @@ export CARGO_PROFILE_RELEASE_LTO=true
# Use bundled autoconf
export M4=m4
export AWK=awk
export AC_MACRODIR=/builddir/build/BUILD/firefox-%{version}/build/autoconf/
export AC_MACRODIR=./build/autoconf/
pushd js/src/
#sh ../../build/autoconf/autoconf.sh --localdir=/builddir/build/BUILD/firefox-%%{version}/js/src configure.in > configure
#chmod +x configure
%configure \
--with-system-icu \
--with-system-zlib \
@ -152,6 +158,7 @@ export AC_MACRODIR=/builddir/build/BUILD/firefox-%{version}/build/autoconf/
%make_build
%install
pushd js/src/
%make_install
# Fix permissions
@ -205,6 +212,7 @@ ln -s libmozjs-%{major}.so.0.0.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so.0
ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so
%check
pushd js/src/
# Run SpiderMonkey tests
%if 0%{?require_tests}
%{python3} tests/jstests.py -d -s -t 2400 --exclude-file=known_failures.txt --no-progress --wpt=disabled ../../js/src/dist/bin/js%{major}
@ -227,8 +235,8 @@ ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so
%endif
%files
%doc README.html
%license LICENSE
%doc js/src/README.html
%license js/src/LICENSE
%{_libdir}/libmozjs-%{major}.so.0*
%files devel

View File

@ -1 +1 @@
SHA512 (firefox-115.4.0esr.source.tar.xz) = 3ee680c5c503df7e4913794b7029ccffc10889f8f259f16030b24c1c18c1528439123532374ccb3a7e7a0d5d64068949cb85638a29694a7d99b74dd403ddefdc
SHA512 (firefox-115.12.0esr.source.tar.xz) = d98475061d870e0f3aa920b7c0b9b0c1cbdb3f4102f760f1d1c5ea3e45e216c673c8d3662501e7e78af4950a003a519e94b57e9b1eda8d615c159cdf62130e89

View File

@ -0,0 +1,32 @@
From dae1848488117166227b00cd7dcadf704b770339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
Date: Wed, 12 Jun 2024 15:56:03 +0200
Subject: [PATCH] tests: Replace pipes with shlex for Python 3.13
---
js/src/tests/lib/results.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/js/src/tests/lib/results.py b/js/src/tests/lib/results.py
index f902060..ba0c7c6 100644
--- a/js/src/tests/lib/results.py
+++ b/js/src/tests/lib/results.py
@@ -1,5 +1,5 @@
import json
-import pipes
+import shlex
import re
from .progressbar import NullProgressBar, ProgressBar
@@ -9,7 +9,7 @@ from .structuredlog import TestLogger
def escape_cmdline(args):
- return " ".join([pipes.quote(a) for a in args])
+ return " ".join([shlex.quote(a) for a in args])
class TestOutput:
--
2.45.1