diff options
Diffstat (limited to 'source/l/mozjs102/patches')
11 files changed, 0 insertions, 411 deletions
diff --git a/source/l/mozjs102/patches/0001-Skip-failing-tests-on-ppc64-and-s390x.patch b/source/l/mozjs102/patches/0001-Skip-failing-tests-on-ppc64-and-s390x.patch deleted file mode 100644 index 5c2866473..000000000 --- a/source/l/mozjs102/patches/0001-Skip-failing-tests-on-ppc64-and-s390x.patch +++ /dev/null @@ -1,36 +0,0 @@ -From db3a0a25b97377b388532b23e73a10d246f66496 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com> -Date: Mon, 3 Aug 2020 10:27:00 +0200 -Subject: [PATCH] Skip failing tests on ppc64 and s390x - -ppc64 and s390x: non262/extensions/clone-errors.js -s390x: test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js -s390x, ppc64 and aarch64: test262/built-ins/Date/UTC/fp-evaluation-order.js ---- - js/src/tests/jstests.list | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/js/src/tests/jstests.list b/js/src/tests/jstests.list -index 73ce42f..1797646 100644 ---- a/js/src/tests/jstests.list -+++ b/js/src/tests/jstests.list -@@ -53,6 +53,15 @@ skip-if(!this.hasOwnProperty("Intl")) include test262/intl402/jstests.list - skip-if(!this.hasOwnProperty("Atomics")) include test262/built-ins/Atomics/jstests.list - skip-if(!this.hasOwnProperty("SharedArrayBuffer")) include test262/built-ins/SharedArrayBuffer/jstests.list - -+# Crashes on s390x and ppc64, avoid it -+skip-if(xulRuntime.XPCOMABI.match(/s390x|ppc64-/)) script non262/extensions/clone-errors.js -+ -+# Crashes on s390x, ppc64, aarch64 -+skip-if(xulRuntime.XPCOMABI.match(/s390x|aarch64|ppc64-/)) script test262/built-ins/Date/UTC/fp-evaluation-order.js -+ -+# Crashes on s390x, avoid it -+skip-if(xulRuntime.XPCOMABI.match(/s390x/)) script test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js -+ - ##################################### - # Test262 tests disabled on browser # - ##################################### --- -2.31.1 - - diff --git a/source/l/mozjs102/patches/copy-headers.patch b/source/l/mozjs102/patches/copy-headers.patch deleted file mode 100644 index dfddcfaee..000000000 --- a/source/l/mozjs102/patches/copy-headers.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3b3c8e37cca418e07bdeceaf3a601805df28d925 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com> -Date: Wed, 15 Jul 2020 08:27:39 +0200 -Subject: [PATCH] build: Copy headers on install instead of symlinking - -Patch by Philip Chimento ported forward to mozjs78 ---- - python/mozbuild/mozbuild/backend/recursivemake.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py -index 858d4d4..8c229e8 100644 ---- a/python/mozbuild/mozbuild/backend/recursivemake.py -+++ b/python/mozbuild/mozbuild/backend/recursivemake.py -@@ -1533,9 +1533,9 @@ class RecursiveMakeBackend(MakeBackend): - " of srcdir-relative or absolute paths." - ) - -- install_manifest.add_pattern_link(basepath, wild, dest_dir) -+ install_manifest.add_pattern_copy(basepath, wild, dest_dir) - else: -- install_manifest.add_pattern_link(f.srcdir, f, dest_dir) -+ install_manifest.add_pattern_copy(f.srcdir, f, dest_dir) - elif isinstance(f, AbsolutePath): - if not f.full_path.lower().endswith((".dll", ".pdb", ".so")): - raise Exception( -@@ -1546,7 +1546,7 @@ class RecursiveMakeBackend(MakeBackend): - install_manifest.add_optional_exists(dest_file) - absolute_files.append(f.full_path) - else: -- install_manifest.add_link(f.full_path, dest_file) -+ install_manifest.add_copy(f.full_path, dest_file) - else: - install_manifest.add_optional_exists(dest_file) - objdir_files.append(self._pretty_path(f, backend_file)) --- -2.37.1 - diff --git a/source/l/mozjs102/patches/emitter.patch b/source/l/mozjs102/patches/emitter.patch deleted file mode 100644 index 8d5aafb15..000000000 --- a/source/l/mozjs102/patches/emitter.patch +++ /dev/null @@ -1,67 +0,0 @@ -From d1d785c169345b81c76213f6dd9be32b4db60294 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com> -Date: Wed, 15 Jul 2020 08:39:47 +0200 -Subject: [PATCH] Build: allow LOCAL_INCLUDES paths with topsrcdir or topobjdir - ---- - python/mozbuild/mozbuild/frontend/emitter.py | 10 --------- - .../mozbuild/test/frontend/test_emitter.py | 22 ------------------- - 2 files changed, 32 deletions(-) - -diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py -index 0b7ccef..a3c7f2f 100644 ---- a/python/mozbuild/mozbuild/frontend/emitter.py -+++ b/python/mozbuild/mozbuild/frontend/emitter.py -@@ -1365,16 +1365,6 @@ class TreeMetadataEmitter(LoggingMixin): - "(resolved to %s)" % (local_include, full_path), - context, - ) -- if ( -- full_path == context.config.topsrcdir -- or full_path == context.config.topobjdir -- ): -- raise SandboxValidationError( -- "Path specified in LOCAL_INCLUDES " -- "(%s) resolves to the topsrcdir or topobjdir (%s), which is " -- "not allowed" % (local_include, full_path), -- context, -- ) - include_obj = LocalInclude(context, local_include) - local_includes.append(include_obj.path.full_path) - yield include_obj -diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py -index 99507fc..821de22 100644 ---- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py -+++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py -@@ -1076,28 +1076,6 @@ class TestEmitterBasic(unittest.TestCase): - - self.assertEqual(local_includes, expected) - -- def test_local_includes_invalid(self): -- """Test that invalid LOCAL_INCLUDES are properly detected.""" -- reader = self.reader("local_includes-invalid/srcdir") -- -- with six.assertRaisesRegex( -- self, -- SandboxValidationError, -- "Path specified in LOCAL_INCLUDES.*resolves to the " -- "topsrcdir or topobjdir", -- ): -- self.read_topsrcdir(reader) -- -- reader = self.reader("local_includes-invalid/objdir") -- -- with six.assertRaisesRegex( -- self, -- SandboxValidationError, -- "Path specified in LOCAL_INCLUDES.*resolves to the " -- "topsrcdir or topobjdir", -- ): -- self.read_topsrcdir(reader) -- - def test_local_includes_file(self): - """Test that a filename can't be used in LOCAL_INCLUDES.""" - reader = self.reader("local_includes-filename") --- -2.37.1 - diff --git a/source/l/mozjs102/patches/fix-soname.patch b/source/l/mozjs102/patches/fix-soname.patch deleted file mode 100644 index 832326489..000000000 --- a/source/l/mozjs102/patches/fix-soname.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d21c7cb9343d8c495d987e71be0f35887574c820 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com> -Date: Wed, 15 Jul 2020 08:21:47 +0200 -Subject: [PATCH] Add soname switch to linker, regardless of Operating System - -Fix backported from Debian: http://bugs.debian.org/746705 ---- - config/rules.mk | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/config/rules.mk b/config/rules.mk -index 90a9946..dc87789 100644 ---- a/config/rules.mk -+++ b/config/rules.mk -@@ -291,6 +291,8 @@ ifeq ($(OS_ARCH),GNU) - OS_CPPFLAGS += -DPATH_MAX=1024 -DMAXPATHLEN=1024 - endif - -+EXTRA_DSO_LDOPTS += -Wl,-soname,lib$(JS_LIBRARY_NAME).so.0 -+ - # - # MINGW32 - # --- -2.37.1 - diff --git a/source/l/mozjs102/patches/icu_sources_data-Write-command-output-to-our-stderr.patch b/source/l/mozjs102/patches/icu_sources_data-Write-command-output-to-our-stderr.patch deleted file mode 100644 index 84684250c..000000000 --- a/source/l/mozjs102/patches/icu_sources_data-Write-command-output-to-our-stderr.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Simon McVittie <smcv@debian.org> -Date: Mon, 9 Oct 2017 09:23:14 +0100 -Subject: icu_sources_data: Write command output to our stderr - -Saying "See output in /tmp/foobar" is all very well for a developer -build, but on a buildd our /tmp is going to get thrown away after -the build. Just log the usual way instead. ---- - intl/icu_sources_data.py | 16 ++++------------ - 1 file changed, 4 insertions(+), 12 deletions(-) - -diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py -index 4db52af..d62960d 100644 ---- a/intl/icu_sources_data.py -+++ b/intl/icu_sources_data.py -@@ -188,21 +188,13 @@ def update_sources(topsrcdir): - - def try_run(name, command, cwd=None, **kwargs): - try: -- with tempfile.NamedTemporaryFile(prefix=name, delete=False) as f: -- subprocess.check_call( -- command, cwd=cwd, stdout=f, stderr=subprocess.STDOUT, **kwargs -- ) -- except subprocess.CalledProcessError: -- print( -- """Error running "{}" in directory {} -- See output in {}""".format( -- " ".join(command), cwd, f.name -- ), -- file=sys.stderr, -+ subprocess.check_call( -+ command, cwd=cwd, stdout=sys.stderr, stderr=subprocess.STDOUT, **kwargs - ) -+ except subprocess.CalledProcessError: -+ print('''Error running "{}" in directory {}'''.format(' '.join(command), cwd), file=sys.stderr) - return False - else: -- os.unlink(f.name) - return True - - --- -2.31.1 - diff --git a/source/l/mozjs102/patches/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch b/source/l/mozjs102/patches/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch deleted file mode 100644 index 8572c21fd..000000000 --- a/source/l/mozjs102/patches/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Simon McVittie <smcv@debian.org> -Date: Mon, 9 Oct 2017 09:22:12 +0100 -Subject: icu_sources_data.py: Decouple from Mozilla build system - -mozpack.path is a wrapper around os.path that normalizes path -separators on Windows, but on Unix we only have one path separator -so there's nothing to normalize. Avoid needing to import all of it. ---- - intl/icu_sources_data.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py -index 2936df9..4db52af 100644 ---- a/intl/icu_sources_data.py -+++ b/intl/icu_sources_data.py -@@ -21,7 +21,9 @@ import subprocess - import sys - import tempfile - --from mozpack import path as mozpath -+# Close enough -+import os.path as mozpath -+mozpath.normsep = lambda p: p - - # The following files have been determined to be dead/unused by a - # semi-automated analysis. You can just remove any of the files below --- -2.31.1 - diff --git a/source/l/mozjs102/patches/init_patch.patch b/source/l/mozjs102/patches/init_patch.patch deleted file mode 100644 index 28ed1d31a..000000000 --- a/source/l/mozjs102/patches/init_patch.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 00414eb67ab0591911167155963b5524fbf2b0c0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com> -Date: Mon, 9 Aug 2021 14:38:58 +0200 -Subject: [PATCH] Don't throw InvalidOptionError on invalid options - ---- - python/mozbuild/mozbuild/configure/__init__.py | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py -index f3167f6..c9e1132 100644 ---- a/python/mozbuild/mozbuild/configure/__init__.py -+++ b/python/mozbuild/mozbuild/configure/__init__.py -@@ -557,10 +557,7 @@ class ConfigureSandbox(dict): - for arg in self._helper: - without_value = arg.split("=", 1)[0] - msg = "Unknown option: %s" % without_value -- if self._help: -- self._logger.warning(msg) -- else: -- raise InvalidOptionError(msg) -+ self._logger.warning(msg) - - # Run the execution queue - for func, args in self._execution_queue: --- -2.31.1 - diff --git a/source/l/mozjs102/patches/remove-sloppy-m4-detection-from-bundled-autoconf.patch b/source/l/mozjs102/patches/remove-sloppy-m4-detection-from-bundled-autoconf.patch deleted file mode 100644 index 10b8b16ea..000000000 --- a/source/l/mozjs102/patches/remove-sloppy-m4-detection-from-bundled-autoconf.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 2d99a7b076578a3394fb9d5be6eb44f9cfebc681 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com> -Date: Mon, 9 Aug 2021 16:15:37 +0200 -Subject: [PATCH] Remove sloppy m4 detection from bundled autoconf - ---- - build/autoconf/autoconf.sh | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/build/autoconf/autoconf.sh b/build/autoconf/autoconf.sh -index ceb8a25..606c74e 100644 ---- a/build/autoconf/autoconf.sh -+++ b/build/autoconf/autoconf.sh -@@ -114,12 +114,6 @@ fi - - # Use the frozen version of Autoconf if available. - r= f= --# Some non-GNU m4's don't reject the --help option, so give them /dev/null. --case `$M4 --help < /dev/null 2>&1` in --*reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;; --*traditional*) ;; --*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;; --esac - - $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout || - { rm -f $tmpin $tmpout; exit 2; } --- -2.31.1 - diff --git a/source/l/mozjs102/patches/spidermonkey_checks_disable.patch b/source/l/mozjs102/patches/spidermonkey_checks_disable.patch deleted file mode 100644 index 451d3eef4..000000000 --- a/source/l/mozjs102/patches/spidermonkey_checks_disable.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 6ebe8ce6a3267c96454de3cd453269b4c4053a3e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com> -Date: Mon, 9 Aug 2021 14:41:14 +0200 -Subject: [PATCH] Don't die on SpiderMonkey checks - ---- - config/run_spidermonkey_checks.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/config/run_spidermonkey_checks.py b/config/run_spidermonkey_checks.py -index 0f842d9..b49db52 100644 ---- a/config/run_spidermonkey_checks.py -+++ b/config/run_spidermonkey_checks.py -@@ -11,5 +11,3 @@ import sys - def main(output, lib_file, *scripts): - for script in scripts: - retcode = subprocess.call([sys.executable, script], cwd=buildconfig.topsrcdir) -- if retcode != 0: -- raise Exception(script + " failed") --- -2.31.1 - diff --git a/source/l/mozjs102/patches/tests-Use-native-TemporaryDirectory.patch b/source/l/mozjs102/patches/tests-Use-native-TemporaryDirectory.patch deleted file mode 100644 index 054685c1e..000000000 --- a/source/l/mozjs102/patches/tests-Use-native-TemporaryDirectory.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 1af9fdd2124547099eb0cf5a71b513ef5592dbf9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com> -Date: Tue, 10 Aug 2021 00:00:50 +0200 -Subject: [PATCH] Tests: Use native TemporaryDirectory - -Without ugly wrapper for Py < 3.2 that doesn't work half of the times... ---- - js/src/jit-test/jit_test.py | 2 +- - js/src/tests/jstests.py | 2 +- - js/src/tests/lib/tempfile.py | 17 +---------------- - 3 files changed, 3 insertions(+), 18 deletions(-) - -diff --git a/js/src/jit-test/jit_test.py b/js/src/jit-test/jit_test.py -index f5d7794..8d443aa 100755 ---- a/js/src/jit-test/jit_test.py -+++ b/js/src/jit-test/jit_test.py -@@ -38,7 +38,7 @@ from lib.tests import ( - get_environment_overlay, - change_env, - ) --from lib.tempfile import TemporaryDirectory -+from tempfile import TemporaryDirectory - - - def which(name): -diff --git a/js/src/tests/jstests.py b/js/src/tests/jstests.py -index 6fa2f5f..53ceff6 100755 ---- a/js/src/tests/jstests.py -+++ b/js/src/tests/jstests.py -@@ -37,7 +37,7 @@ from lib.tests import ( - from lib.results import ResultsSink, TestOutput - from lib.progressbar import ProgressBar - from lib.adaptor import xdr_annotate --from lib.tempfile import TemporaryDirectory -+from tempfile import TemporaryDirectory - - if sys.platform.startswith("linux") or sys.platform.startswith("darwin"): - from lib.tasks_unix import run_all_tests -diff --git a/js/src/tests/lib/tempfile.py b/js/src/tests/lib/tempfile.py -index ecc21c9..f0a1fa3 100644 ---- a/js/src/tests/lib/tempfile.py -+++ b/js/src/tests/lib/tempfile.py -@@ -2,19 +2,4 @@ - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - from __future__ import absolute_import -- --try: -- # Python 3.2 -- from tempfile import TemporaryDirectory --except ImportError: -- import tempfile -- import shutil -- from contextlib import contextmanager -- -- @contextmanager -- def TemporaryDirectory(*args, **kwds): -- d = tempfile.mkdtemp(*args, **kwds) -- try: -- yield d -- finally: -- shutil.rmtree(d) -+from tempfile import TemporaryDirectory --- -2.31.1 - diff --git a/source/l/mozjs102/patches/tests-increase-timeout.patch b/source/l/mozjs102/patches/tests-increase-timeout.patch deleted file mode 100644 index 2ba725ce9..000000000 --- a/source/l/mozjs102/patches/tests-increase-timeout.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9be85b155c6df0454c5faef9e850f572c99e3615 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com> -Date: Wed, 15 Jul 2020 08:32:44 +0200 -Subject: [PATCH] Increase the test timeout for slower buildds - -Ported forward from Debian: https://bugs.debian.org/878284 ---- - js/src/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/js/src/Makefile.in b/js/src/Makefile.in -index 6daed72..16db2de 100644 ---- a/js/src/Makefile.in -+++ b/js/src/Makefile.in -@@ -53,7 +53,7 @@ check:: check-js-msg - - check-jstests: - $(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON3) -u $(srcdir)/tests/jstests.py \ -- --no-progress --format=automation --timeout 300 \ -+ --no-progress --format=automation --timeout 600 \ - $(JSTESTS_EXTRA_ARGS) \ - $(DIST)/bin/js$(BIN_SUFFIX) - --- -2.37.1 - |