Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] mozjs91: remove package
@ 2023-01-18 21:34 Johnnynator
  2023-01-18 21:36 ` classabbyamp
                   ` (4 more replies)
  0 siblings, 5 replies; 7+ messages in thread
From: Johnnynator @ 2023-01-18 21:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1303 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages remove-mozjs91
https://github.com/void-linux/void-packages/pull/41730

mozjs91: remove package
the build is currently broken and nothing depends on it

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41730.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-mozjs91-41730.patch --]
[-- Type: text/x-diff, Size: 35412 bytes --]

From b213427e95853dd8f1c64952cef8eb77ace28878 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 18 Jan 2023 22:33:03 +0100
Subject: [PATCH] mozjs91: remove package

the build is currently broken and nothing depends on it
---
 srcpkgs/mozjs91-devel                         |  1 -
 srcpkgs/mozjs91/patches/001-fix-soname.patch  | 26 -----
 .../mozjs91/patches/002-copy-headers.patch    | 38 -------
 .../mozjs91/patches/003-tests-timeout.patch   | 26 -----
 .../004-icu-sources-data-py-decouple.patch    | 29 ------
 ...cu-sources-data-write-command-stderr.patch | 44 ---------
 srcpkgs/mozjs91/patches/006-emitter.patch     | 67 -------------
 ...-tests-use-native-temporarydirectory.patch | 66 -------------
 srcpkgs/mozjs91/patches/008-init-patch.patch  | 28 ------
 .../patches/009-sloppy-m4-detection.patch     | 29 ------
 .../011-failing-tests-ppc64-s390x.patch       | 36 -------
 srcpkgs/mozjs91/patches/012-fix-musl.patch    | 21 ----
 .../013-disable-spidermonkey-jslint.patch     | 26 -----
 srcpkgs/mozjs91/patches/014-rust-target.patch | 28 ------
 .../patches/015-drop-rustc-validation.patch   | 80 ---------------
 .../mozjs91/patches/017-no-lto-readelf.patch  | 35 -------
 srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch | 18 ----
 srcpkgs/mozjs91/patches/fix-build-ppc32.patch | 19 ----
 srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch | 18 ----
 srcpkgs/mozjs91/template                      | 98 -------------------
 srcpkgs/mozjs91/update                        |  2 -
 srcpkgs/removed-packages/template             |  2 +
 22 files changed, 2 insertions(+), 735 deletions(-)
 delete mode 120000 srcpkgs/mozjs91-devel
 delete mode 100644 srcpkgs/mozjs91/patches/001-fix-soname.patch
 delete mode 100644 srcpkgs/mozjs91/patches/002-copy-headers.patch
 delete mode 100644 srcpkgs/mozjs91/patches/003-tests-timeout.patch
 delete mode 100644 srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.patch
 delete mode 100644 srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-stderr.patch
 delete mode 100644 srcpkgs/mozjs91/patches/006-emitter.patch
 delete mode 100644 srcpkgs/mozjs91/patches/007-tests-use-native-temporarydirectory.patch
 delete mode 100644 srcpkgs/mozjs91/patches/008-init-patch.patch
 delete mode 100644 srcpkgs/mozjs91/patches/009-sloppy-m4-detection.patch
 delete mode 100644 srcpkgs/mozjs91/patches/011-failing-tests-ppc64-s390x.patch
 delete mode 100644 srcpkgs/mozjs91/patches/012-fix-musl.patch
 delete mode 100644 srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch
 delete mode 100644 srcpkgs/mozjs91/patches/014-rust-target.patch
 delete mode 100644 srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch
 delete mode 100644 srcpkgs/mozjs91/patches/017-no-lto-readelf.patch
 delete mode 100644 srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch
 delete mode 100644 srcpkgs/mozjs91/patches/fix-build-ppc32.patch
 delete mode 100644 srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch
 delete mode 100644 srcpkgs/mozjs91/template
 delete mode 100644 srcpkgs/mozjs91/update

diff --git a/srcpkgs/mozjs91-devel b/srcpkgs/mozjs91-devel
deleted file mode 120000
index 61f05e82a26f..000000000000
--- a/srcpkgs/mozjs91-devel
+++ /dev/null
@@ -1 +0,0 @@
-mozjs91
\ No newline at end of file
diff --git a/srcpkgs/mozjs91/patches/001-fix-soname.patch b/srcpkgs/mozjs91/patches/001-fix-soname.patch
deleted file mode 100644
index a319d9e975ef..000000000000
--- a/srcpkgs/mozjs91/patches/001-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 0f9b2ac..f6b4efe 100644
---- a/config/rules.mk
-+++ b/config/rules.mk
-@@ -285,6 +285,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.31.1
-
diff --git a/srcpkgs/mozjs91/patches/002-copy-headers.patch b/srcpkgs/mozjs91/patches/002-copy-headers.patch
deleted file mode 100644
index aafe1aa84bd3..000000000000
--- a/srcpkgs/mozjs91/patches/002-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 d964466..0285ad9 100644
---- a/python/mozbuild/mozbuild/backend/recursivemake.py
-+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
-@@ -1568,9 +1568,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(
-@@ -1581,7 +1581,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.31.1
-
diff --git a/srcpkgs/mozjs91/patches/003-tests-timeout.patch b/srcpkgs/mozjs91/patches/003-tests-timeout.patch
deleted file mode 100644
index c86cca403deb..000000000000
--- a/srcpkgs/mozjs91/patches/003-tests-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 b86aeed..d68655a 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_SHELL_NAME)$(BIN_SUFFIX)
- 
--- 
-2.26.2
-
diff --git a/srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.patch b/srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.patch
deleted file mode 100644
index 8572c21fd4ec..000000000000
--- a/srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.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/srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-stderr.patch b/srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-stderr.patch
deleted file mode 100644
index 84684250ce4c..000000000000
--- a/srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-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/srcpkgs/mozjs91/patches/006-emitter.patch b/srcpkgs/mozjs91/patches/006-emitter.patch
deleted file mode 100644
index 556bebd257ca..000000000000
--- a/srcpkgs/mozjs91/patches/006-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 44b916e..f2e821d 100644
---- a/python/mozbuild/mozbuild/frontend/emitter.py
-+++ b/python/mozbuild/mozbuild/frontend/emitter.py
-@@ -1367,16 +1367,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 e53bc5e..c1b9d32 100644
---- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
-+++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
-@@ -1098,28 +1098,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.31.1
-
diff --git a/srcpkgs/mozjs91/patches/007-tests-use-native-temporarydirectory.patch b/srcpkgs/mozjs91/patches/007-tests-use-native-temporarydirectory.patch
deleted file mode 100644
index 054685c1eee2..000000000000
--- a/srcpkgs/mozjs91/patches/007-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/srcpkgs/mozjs91/patches/008-init-patch.patch b/srcpkgs/mozjs91/patches/008-init-patch.patch
deleted file mode 100644
index 1954a55bf369..000000000000
--- a/srcpkgs/mozjs91/patches/008-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
-@@ -553,10 +553,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/srcpkgs/mozjs91/patches/009-sloppy-m4-detection.patch b/srcpkgs/mozjs91/patches/009-sloppy-m4-detection.patch
deleted file mode 100644
index 10b8b16ea7dc..000000000000
--- a/srcpkgs/mozjs91/patches/009-sloppy-m4-detection.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/srcpkgs/mozjs91/patches/011-failing-tests-ppc64-s390x.patch b/srcpkgs/mozjs91/patches/011-failing-tests-ppc64-s390x.patch
deleted file mode 100644
index 5c286647325c..000000000000
--- a/srcpkgs/mozjs91/patches/011-failing-tests-ppc64-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/srcpkgs/mozjs91/patches/012-fix-musl.patch b/srcpkgs/mozjs91/patches/012-fix-musl.patch
deleted file mode 100644
index 814912633217..000000000000
--- a/srcpkgs/mozjs91/patches/012-fix-musl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 80ae97f2b875493c5714d00ae5c2a13efbd6e017
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date:   Sun Jan 23 21:06:47 2022 +0100
-
-    fix musl miscompilation
-    
-    https://github.com/void-linux/void-packages/issues/2598
-
-diff --git a/js/src/old-configure.in b/js/src/old-configure.in
-index 77652f67..ab5e917b 100644
---- a/js/src/old-configure.in
-+++ b/js/src/old-configure.in
-@@ -1069,7 +1069,7 @@ if test "$ac_cv_thread_keyword" = yes; then
-     mips*-*)
-       :
-       ;;
--    *-android*|*-linuxandroid*)
-+    *-android*|*-linuxandroid*|*-musl*)
-       :
-       ;;
-     *)
diff --git a/srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch b/srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch
deleted file mode 100644
index 93e8c83f9337..000000000000
--- a/srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 34d8f3fb025e930450ce44f7aac501da4c2adc9c
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date:   Sun Jan 23 21:09:42 2022 +0100
-
-    disable spidermonkey jslint
-
-diff --git a/js/src/build/moz.build b/js/src/build/moz.build
-index 55c66b97..243f7db2 100644
---- a/js/src/build/moz.build
-+++ b/js/src/build/moz.build
-@@ -97,15 +97,3 @@ NO_EXPAND_LIBS = True
- 
- DIST_INSTALL = True
- 
--# Run SpiderMonkey style checker after linking the static library. This avoids
--# running the script for no-op builds.
--GeneratedFile(
--    "spidermonkey_checks",
--    script="/config/run_spidermonkey_checks.py",
--    inputs=[
--        "!%sjs_static.%s" % (CONFIG["LIB_PREFIX"], CONFIG["LIB_SUFFIX"]),
--        "/config/check_spidermonkey_style.py",
--        "/config/check_macroassembler_style.py",
--        "/config/check_js_opcode.py",
--    ],
--)
diff --git a/srcpkgs/mozjs91/patches/014-rust-target.patch b/srcpkgs/mozjs91/patches/014-rust-target.patch
deleted file mode 100644
index 4d8918a2a54c..000000000000
--- a/srcpkgs/mozjs91/patches/014-rust-target.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 34b3ac3195a40757bc5f51a1db5a47a4b18c68b5
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date:   Sun Jan 23 21:13:38 2022 +0100
-
-    bypass rust triplet checks and just force ours
-
-diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
-index cd77d72b..0c03cab7 100644
---- a/build/moz.configure/rust.configure
-+++ b/build/moz.configure/rust.configure
-@@ -261,7 +261,7 @@ def rust_supported_targets(rustc):
-         data.setdefault(key, []).append(namespace(rust_target=t, target=info))
-     return data
- 
--
-+@imports("os")
- def detect_rustc_target(
-     host_or_target, compiler_info, arm_target, rust_supported_targets
- ):
-@@ -383,7 +383,7 @@ def detect_rustc_target(
- 
-         return None
- 
--    rustc_target = find_candidate(candidates)
-+    rustc_target = os.environ["RUST_TARGET"]
- 
-     if rustc_target is None:
-         die("Don't know how to translate {} for rustc".format(host_or_target.alias))
diff --git a/srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch b/srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch
deleted file mode 100644
index e2b340cd060e..000000000000
--- a/srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-drop some rust compiler validation
-
---- a/build/moz.configure/rust.configure
-+++ b/build/moz.configure/rust.configure
-@@ -91,9 +91,6 @@ def unwrap_rustup(prog, name):
-     return unwrap
- 
- 
--rustc = unwrap_rustup(rustc, "rustc")
--cargo = unwrap_rustup(cargo, "cargo")
--
- 
- set_config("CARGO", cargo)
- set_config("RUSTC", rustc)
-@@ -411,35 +408,6 @@ def assert_rust_compile(host_or_target, rustc_target, rustc):
- 
-         os.write(in_fd, ensure_binary(source))
-         os.close(in_fd)
--
--        cmd = [
--            rustc,
--            "--crate-type",
--            "staticlib",
--            target_arg,
--            "-o",
--            out_path,
--            in_path,
--        ]
--
--        def failed():
--            die(
--                dedent(
--                    """\
--            Cannot compile for {} with {}
--            The target may be unsupported, or you may not have
--            a rust std library for that target installed. Try:
--
--              rustup target add {}
--            """.format(
--                        host_or_target.alias, rustc, rustc_target
--                    )
--                )
--            )
--
--        check_cmd_output(*cmd, onerror=failed)
--        if not os.path.exists(out_path) or os.path.getsize(out_path) == 0:
--            failed()
-     finally:
-         os.remove(in_path)
-         os.remove(out_path)
-@@ -462,29 +430,6 @@ def rust_host_triple(
-     rustc_target = detect_rustc_target(
-         host, compiler_info, arm_target, rust_supported_targets
-     )
--    if rustc_target != rustc_host:
--        if host.alias == rustc_target:
--            configure_host = host.alias
--        else:
--            configure_host = "{}/{}".format(host.alias, rustc_target)
--        die(
--            dedent(
--                """\
--        The rust compiler host ({rustc}) is not suitable for the configure host ({configure}).
--
--        You can solve this by:
--        * Set your configure host to match the rust compiler host by editing your
--        mozconfig and adding "ac_add_options --host={rustc}".
--        * Or, install the rust toolchain for {configure}, if supported, by running
--        "rustup default stable-{rustc_target}"
--        """.format(
--                    rustc=rustc_host,
--                    configure=configure_host,
--                    rustc_target=rustc_target,
--                )
--            )
--        )
--    assert_rust_compile(host, rustc_target, rustc)
-     return rustc_target
- 
- 
diff --git a/srcpkgs/mozjs91/patches/017-no-lto-readelf.patch b/srcpkgs/mozjs91/patches/017-no-lto-readelf.patch
deleted file mode 100644
index 24075c591ff4..000000000000
--- a/srcpkgs/mozjs91/patches/017-no-lto-readelf.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 1cc729c5221d0ce4c80786ccdcb2de4a6ca382b6
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date:   Sun Jan 23 21:55:43 2022 +0100
-
-    drop some library checks
-    
-    This calls readelf and won't work with LTO'd setups.
-
-diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
-index 401c2933..ade4f1da 100644
---- a/config/makefiles/rust.mk
-+++ b/config/makefiles/rust.mk
-@@ -405,22 +405,6 @@ force-cargo-library-build:
- 	$(call CARGO_BUILD) --lib $(cargo_target_flag) $(rust_features_flag) -- $(cargo_rustc_flags)
- 
- $(RUST_LIBRARY_FILE): force-cargo-library-build
--# When we are building in --enable-release mode; we add an additional check to confirm
--# that we are not importing any networking-related functions in rust code. This reduces
--# the chance of proxy bypasses originating from rust code.
--# The check only works when rust code is built with -Clto but without MOZ_LTO_RUST_CROSS.
--# Sanitizers and sancov also fail because compiler-rt hooks network functions.
--ifndef MOZ_PROFILE_GENERATE
--ifeq ($(OS_ARCH), Linux)
--ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN))
--ifndef MOZ_LTO_RUST_CROSS
--ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
--	$(call py_action,check_binary,--target --networking $@)
--endif
--endif
--endif
--endif
--endif
- 
- force-cargo-library-check:
- 	$(call CARGO_CHECK) --lib $(cargo_target_flag) $(rust_features_flag)
diff --git a/srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch b/srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch
deleted file mode 100644
index 4a9b0b42a575..000000000000
--- a/srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/config/makefiles/rust.mk
-+++ b/config/makefiles/rust.mk
-@@ -64,6 +64,7 @@ endif
- # These flags are passed via `cargo rustc` and only apply to the final rustc
- # invocation (i.e., only the top-level crate, not its dependencies).
- cargo_rustc_flags = $(CARGO_RUSTCFLAGS)
-+ifneq (1,$(MOZ_NO_RUST_LTO))
- ifndef DEVELOPER_OPTIONS
- ifndef MOZ_DEBUG_RUST
- # Enable link-time optimization for release builds, but not when linking
-@@ -77,6 +78,7 @@ RUSTFLAGS += -Cembed-bitcode=yes
- endif
- endif
- endif
-+endif
- 
- ifdef CARGO_INCREMENTAL
- export CARGO_INCREMENTAL
diff --git a/srcpkgs/mozjs91/patches/fix-build-ppc32.patch b/srcpkgs/mozjs91/patches/fix-build-ppc32.patch
deleted file mode 100644
index 066330731e5e..000000000000
--- a/srcpkgs/mozjs91/patches/fix-build-ppc32.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 32e52128ce8fe7704a29a5a4fb921a8394540fbc
-Author: q66 <daniel@octaforge.org>
-Date:   Mon Jun 13 14:01:59 2022 +0200
-
-    fix ftbfs on powerpc32
-
-diff --git a/js/src/wasm/WasmFrame.h b/js/src/wasm/WasmFrame.h
-index 85f2612d..df5c9629 100644
---- a/js/src/wasm/WasmFrame.h
-+++ b/js/src/wasm/WasmFrame.h
-@@ -230,7 +230,7 @@ class DebugFrame {
-   // Avoid -Wunused-private-field warnings.
-  protected:
- #if defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_ARM) || \
--    defined(JS_CODEGEN_X86) || defined(__wasi__)
-+    defined(JS_CODEGEN_X86) || defined(__wasi__) || (defined(__powerpc__) && !defined(__powerpc64__))
-   // See alignmentStaticAsserts().  For MIPS32, ARM32 and X86 DebugFrame is only
-   // 4-byte aligned, so we add another word to get up to 8-byte
-   // alignment.
diff --git a/srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch b/srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch
deleted file mode 100644
index 831e5e03678d..000000000000
--- a/srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# error: typedef redefinition with different types ('__double_t' (aka 'double') vs 'long double')
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1729459
-
---- a/modules/fdlibm/src/math_private.h
-+++ b/modules/fdlibm/src/math_private.h
-@@ -30,7 +30,12 @@
-  * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
-  */
- 
-+#if defined(__linux__) && defined(__i386__)
-+// rely on glibc's double_t
-+typedef long double __double_t;
-+#else
- typedef double      __double_t;
-+#endif
- typedef __double_t  double_t;
- 
- /*
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
deleted file mode 100644
index 73fcd54ee76b..000000000000
--- a/srcpkgs/mozjs91/template
+++ /dev/null
@@ -1,98 +0,0 @@
-# Template file for 'mozjs91' 
-pkgname=mozjs91
-version=91.7.1
-revision=2
-build_wrksrc=js/src
-build_style=gnu-configure
-build_helper=rust
-make_check_target=check-jit-test
-configure_args="--disable-jemalloc --disable-strip --disable-tests \
- --disable-optimize --disable-debug --enable-ctypes --enable-readline \
- --enable-shared-js --enable-system-ffi --with-intl-api --with-system-icu \
- --with-system-nspr --with-system-zlib --enable-hardening --enable-release"
-hostmakedepends="make pkg-config python3 python3-setuptools python3-six perl m4
- rust cargo llvm12 clang"
-makedepends="icu-devel libffi-devel nspr-devel python3-devel readline-devel
- zlib-devel rust-std"
-checkdepends=python3
-short_desc="SpiderMonkey JavaScript interpreter and library (91.x)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MPL-2.0"
-homepage="https://spidermonkey.dev"
-distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=57494a445e72f7eacb0bb870a3a79cde3c2143e234873c0c3e269df1d4742c92
-
-LDFLAGS="-Wl,-z,stack-size=1048576"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	LDFLAGS+=" -latomic"
-fi
-
-if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
-	# Disable LTO on i686, otherwise compilation of `jsrust` fails with -
-	# 	error: ran out of registers during register allocation
-	# 	LLVM ERROR: Cannot emit physreg copy instruction
-	# 	error: could not compile `jsrust` due to previous error
-	export MOZ_NO_RUST_LTO=1
-fi
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		configure_args+=" --host=${XBPS_TRIPLET} --target=${XBPS_CROSS_TRIPLET} --enable-linker=bfd"
-	fi
-	export M4=m4
-	export AWK=awk
-	export AC_MACRODIR=../../build/autoconf
-	chmod 0755 ../../build/autoconf/autoconf.sh
-	sh ../../build/autoconf/autoconf.sh configure.in > configure
-	chmod 0755 configure
-}
-
-post_install() {
-	# Remove unneeded static library
-	rm -f "${DESTDIR}"/usr/lib/*.ajs
-
-	# it has correct soname but not the right file name
-	mv "${DESTDIR}"/usr/lib/libmozjs-91.so \
-	   "${DESTDIR}"/usr/lib/libmozjs-91.so.0
-	ln -rs "${DESTDIR}"/usr/lib/libmozjs-91.so.0 \
-	       "${DESTDIR}"/usr/lib/libmozjs-91.so
-}
-
-pre_check() {
-	if [ "$XBPS_WORDSIZE" = 32 ]; then
-		vsed -i jit-test/tests/basic/bug653153.js -e s/65536/65568/g
-		vsed -i jit-test/tests/basic/bug653153.js -e s/65537/65569/g
-	fi
-	if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
-		export JITTEST_EXTRA_ARGS="${JITTEST_EXTRA_ARGS} \
-			-x basic/fdlibm-for-sin-cos-tan-argument.js \
-			-x gc/gcparam.js \
-			-x ion/dce-with-rinstructions.js \
-			-x sunspider/check-3d-cube.js \
-			-x sunspider/check-3d-raytrace.js \
-			-x sunspider/check-access-nbody.js \
-			-x wasm/nan-semantics.js \
-			-x wasm/spec/spec/float_literals.wast.js \
-			-x wasm/spec/spec/float_memory.wast.js \
-			-x wasm/spec/threads/float_memory.wast.js \
-			"
-	fi
-	if [ "$XBPS_LIBC" = musl ]; then
-		export JITTEST_EXTRA_ARGS="${JITTEST_EXTRA_ARGS} \
-			-x sunspider/check-date-format-tofte.js \
-			"
-	fi
-}
-
-mozjs91-devel_package() {
-	depends="nspr-devel ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/js91-config
-		vmove usr/include
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-	}
-}
diff --git a/srcpkgs/mozjs91/update b/srcpkgs/mozjs91/update
deleted file mode 100644
index f942fe4f0fc9..000000000000
--- a/srcpkgs/mozjs91/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="${MOZILLA_SITE}/firefox/releases/"
-pattern="releases/\K${version%%.*}.*(?=esr/\")"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1538b42fd3bd..021aa077eb90 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -317,6 +317,8 @@ replaces="
  mirrorbits<=0.5.1_1
  mongroup<=0.4.1_2
  mozjs68<=68.11.0_1
+ mozjs91<=91.7.1
+ mozjs91-devel<=91.7.1
  mp3gain<=1.6.2_2
  mutagen<=1.43.0_3
  nautilus-sendto<=3.8.6_2

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: mozjs91: remove package
  2023-01-18 21:34 [PR PATCH] mozjs91: remove package Johnnynator
@ 2023-01-18 21:36 ` classabbyamp
  2023-01-18 21:55 ` oreo639
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 7+ messages in thread
From: classabbyamp @ 2023-01-18 21:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 154 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/41730#issuecomment-1396118806

Comment:
#41296 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: mozjs91: remove package
  2023-01-18 21:34 [PR PATCH] mozjs91: remove package Johnnynator
  2023-01-18 21:36 ` classabbyamp
@ 2023-01-18 21:55 ` oreo639
  2023-01-18 21:56 ` oreo639
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 7+ messages in thread
From: oreo639 @ 2023-01-18 21:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 572 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/41730#issuecomment-1396138871

Comment:
> the build is currently broken

The patch to fix mozjs91 build is the same as the one currently used to fix mozjs102 build. (the python 3.11 patch)
https://github.com/void-linux/void-packages/blob/master/srcpkgs/mozjs102/patches/python-3.11.patch

The patch for mozjs73 is a little different, but I have it in the gcc libssp PR.
https://github.com/oreo639/void-packages/blob/libssp/srcpkgs/mozjs78/patches/python-3.11.patch

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: mozjs91: remove package
  2023-01-18 21:34 [PR PATCH] mozjs91: remove package Johnnynator
  2023-01-18 21:36 ` classabbyamp
  2023-01-18 21:55 ` oreo639
@ 2023-01-18 21:56 ` oreo639
  2023-01-18 21:57 ` oreo639
  2023-01-22 22:29 ` [PR PATCH] [Closed]: " Johnnynator
  4 siblings, 0 replies; 7+ messages in thread
From: oreo639 @ 2023-01-18 21:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 568 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/41730#issuecomment-1396138871

Comment:
> the build is currently broken

The patch to fix mozjs91 build is the same as the one currently used to fix mozjs102 build. (the python 3.11 patch)
https://github.com/void-linux/void-packages/blob/master/srcpkgs/mozjs102/patches/python-3.11.patch

The patch for mozjs73 is a little different, but I have it in the libssp PR.
https://github.com/oreo639/void-packages/blob/libssp/srcpkgs/mozjs78/patches/python-3.11.patch

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: mozjs91: remove package
  2023-01-18 21:34 [PR PATCH] mozjs91: remove package Johnnynator
                   ` (2 preceding siblings ...)
  2023-01-18 21:56 ` oreo639
@ 2023-01-18 21:57 ` oreo639
  2023-01-22 22:29 ` [PR PATCH] [Closed]: " Johnnynator
  4 siblings, 0 replies; 7+ messages in thread
From: oreo639 @ 2023-01-18 21:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 568 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/41730#issuecomment-1396138871

Comment:
> the build is currently broken

The patch to fix mozjs91 build is the same as the one currently used to fix mozjs102 build. (the python 3.11 patch)
https://github.com/void-linux/void-packages/blob/master/srcpkgs/mozjs102/patches/python-3.11.patch

The patch for mozjs78 is a little different, but I have it in the libssp PR.
https://github.com/oreo639/void-packages/blob/libssp/srcpkgs/mozjs78/patches/python-3.11.patch

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Closed]: mozjs91: remove package
  2023-01-18 21:34 [PR PATCH] mozjs91: remove package Johnnynator
                   ` (3 preceding siblings ...)
  2023-01-18 21:57 ` oreo639
@ 2023-01-22 22:29 ` Johnnynator
  4 siblings, 0 replies; 7+ messages in thread
From: Johnnynator @ 2023-01-22 22:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1137 bytes --]

There's a closed pull request on the void-packages repository

mozjs91: remove package
https://github.com/void-linux/void-packages/pull/41730

Description:
the build is currently broken and nothing depends on it

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PR PATCH] mozjs91: remove package
@ 2022-12-26  8:47 oreo639
  0 siblings, 0 replies; 7+ messages in thread
From: oreo639 @ 2022-12-26  8:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1359 bytes --]

There is a new pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages mozjs91
https://github.com/void-linux/void-packages/pull/41296

mozjs91: remove package
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

Nothing depends on it, also allows us to avoid rebuilding it: https://github.com/void-linux/void-packages/pull/41294

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41296.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mozjs91-41296.patch --]
[-- Type: text/x-diff, Size: 34933 bytes --]

From 4435d0dbd307404fa96e47b5b9ba4d579bf951a6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:46:55 -0800
Subject: [PATCH] mozjs91: remove package

---
 common/shlibs                                 |  1 -
 srcpkgs/mozjs91/patches/001-fix-soname.patch  | 26 -----
 .../mozjs91/patches/002-copy-headers.patch    | 38 -------
 .../mozjs91/patches/003-tests-timeout.patch   | 26 -----
 .../004-icu-sources-data-py-decouple.patch    | 29 ------
 ...cu-sources-data-write-command-stderr.patch | 44 ---------
 srcpkgs/mozjs91/patches/006-emitter.patch     | 67 -------------
 ...-tests-use-native-temporarydirectory.patch | 66 -------------
 srcpkgs/mozjs91/patches/008-init-patch.patch  | 28 ------
 .../patches/009-sloppy-m4-detection.patch     | 29 ------
 .../011-failing-tests-ppc64-s390x.patch       | 36 -------
 srcpkgs/mozjs91/patches/012-fix-musl.patch    | 21 ----
 .../013-disable-spidermonkey-jslint.patch     | 26 -----
 srcpkgs/mozjs91/patches/014-rust-target.patch | 28 ------
 .../patches/015-drop-rustc-validation.patch   | 80 ---------------
 .../mozjs91/patches/017-no-lto-readelf.patch  | 35 -------
 srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch | 18 ----
 srcpkgs/mozjs91/patches/fix-build-ppc32.patch | 19 ----
 srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch | 18 ----
 srcpkgs/mozjs91/template                      | 99 ++-----------------
 20 files changed, 7 insertions(+), 727 deletions(-)
 delete mode 100644 srcpkgs/mozjs91/patches/001-fix-soname.patch
 delete mode 100644 srcpkgs/mozjs91/patches/002-copy-headers.patch
 delete mode 100644 srcpkgs/mozjs91/patches/003-tests-timeout.patch
 delete mode 100644 srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.patch
 delete mode 100644 srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-stderr.patch
 delete mode 100644 srcpkgs/mozjs91/patches/006-emitter.patch
 delete mode 100644 srcpkgs/mozjs91/patches/007-tests-use-native-temporarydirectory.patch
 delete mode 100644 srcpkgs/mozjs91/patches/008-init-patch.patch
 delete mode 100644 srcpkgs/mozjs91/patches/009-sloppy-m4-detection.patch
 delete mode 100644 srcpkgs/mozjs91/patches/011-failing-tests-ppc64-s390x.patch
 delete mode 100644 srcpkgs/mozjs91/patches/012-fix-musl.patch
 delete mode 100644 srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch
 delete mode 100644 srcpkgs/mozjs91/patches/014-rust-target.patch
 delete mode 100644 srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch
 delete mode 100644 srcpkgs/mozjs91/patches/017-no-lto-readelf.patch
 delete mode 100644 srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch
 delete mode 100644 srcpkgs/mozjs91/patches/fix-build-ppc32.patch
 delete mode 100644 srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch

diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..0fff6f255282 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3498,7 +3498,6 @@ libKF5Syndication.so.5 syndication-5.50.0_1
 liblqr-1.so.0 liblqr-0.4.2_1
 libmozjs-102.so.0 mozjs102-102.3.0_1
 libmozjs-78.so.0 mozjs78-78.1.0_1
-libmozjs-91.so.0 mozjs91-91.5.0_1
 libebur128.so.1 libebur128-1.2.4_1
 libgtksourceview-4.so.0 gtksourceview4-4.0.2_1
 libgtksourceview-5.so.0 gtksourceview5-5.2.0_1
diff --git a/srcpkgs/mozjs91/patches/001-fix-soname.patch b/srcpkgs/mozjs91/patches/001-fix-soname.patch
deleted file mode 100644
index a319d9e975ef..000000000000
--- a/srcpkgs/mozjs91/patches/001-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 0f9b2ac..f6b4efe 100644
---- a/config/rules.mk
-+++ b/config/rules.mk
-@@ -285,6 +285,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.31.1
-
diff --git a/srcpkgs/mozjs91/patches/002-copy-headers.patch b/srcpkgs/mozjs91/patches/002-copy-headers.patch
deleted file mode 100644
index aafe1aa84bd3..000000000000
--- a/srcpkgs/mozjs91/patches/002-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 d964466..0285ad9 100644
---- a/python/mozbuild/mozbuild/backend/recursivemake.py
-+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
-@@ -1568,9 +1568,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(
-@@ -1581,7 +1581,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.31.1
-
diff --git a/srcpkgs/mozjs91/patches/003-tests-timeout.patch b/srcpkgs/mozjs91/patches/003-tests-timeout.patch
deleted file mode 100644
index c86cca403deb..000000000000
--- a/srcpkgs/mozjs91/patches/003-tests-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 b86aeed..d68655a 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_SHELL_NAME)$(BIN_SUFFIX)
- 
--- 
-2.26.2
-
diff --git a/srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.patch b/srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.patch
deleted file mode 100644
index 8572c21fd4ec..000000000000
--- a/srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.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/srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-stderr.patch b/srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-stderr.patch
deleted file mode 100644
index 84684250ce4c..000000000000
--- a/srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-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/srcpkgs/mozjs91/patches/006-emitter.patch b/srcpkgs/mozjs91/patches/006-emitter.patch
deleted file mode 100644
index 556bebd257ca..000000000000
--- a/srcpkgs/mozjs91/patches/006-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 44b916e..f2e821d 100644
---- a/python/mozbuild/mozbuild/frontend/emitter.py
-+++ b/python/mozbuild/mozbuild/frontend/emitter.py
-@@ -1367,16 +1367,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 e53bc5e..c1b9d32 100644
---- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
-+++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
-@@ -1098,28 +1098,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.31.1
-
diff --git a/srcpkgs/mozjs91/patches/007-tests-use-native-temporarydirectory.patch b/srcpkgs/mozjs91/patches/007-tests-use-native-temporarydirectory.patch
deleted file mode 100644
index 054685c1eee2..000000000000
--- a/srcpkgs/mozjs91/patches/007-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/srcpkgs/mozjs91/patches/008-init-patch.patch b/srcpkgs/mozjs91/patches/008-init-patch.patch
deleted file mode 100644
index 1954a55bf369..000000000000
--- a/srcpkgs/mozjs91/patches/008-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
-@@ -553,10 +553,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/srcpkgs/mozjs91/patches/009-sloppy-m4-detection.patch b/srcpkgs/mozjs91/patches/009-sloppy-m4-detection.patch
deleted file mode 100644
index 10b8b16ea7dc..000000000000
--- a/srcpkgs/mozjs91/patches/009-sloppy-m4-detection.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/srcpkgs/mozjs91/patches/011-failing-tests-ppc64-s390x.patch b/srcpkgs/mozjs91/patches/011-failing-tests-ppc64-s390x.patch
deleted file mode 100644
index 5c286647325c..000000000000
--- a/srcpkgs/mozjs91/patches/011-failing-tests-ppc64-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/srcpkgs/mozjs91/patches/012-fix-musl.patch b/srcpkgs/mozjs91/patches/012-fix-musl.patch
deleted file mode 100644
index 814912633217..000000000000
--- a/srcpkgs/mozjs91/patches/012-fix-musl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 80ae97f2b875493c5714d00ae5c2a13efbd6e017
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date:   Sun Jan 23 21:06:47 2022 +0100
-
-    fix musl miscompilation
-    
-    https://github.com/void-linux/void-packages/issues/2598
-
-diff --git a/js/src/old-configure.in b/js/src/old-configure.in
-index 77652f67..ab5e917b 100644
---- a/js/src/old-configure.in
-+++ b/js/src/old-configure.in
-@@ -1069,7 +1069,7 @@ if test "$ac_cv_thread_keyword" = yes; then
-     mips*-*)
-       :
-       ;;
--    *-android*|*-linuxandroid*)
-+    *-android*|*-linuxandroid*|*-musl*)
-       :
-       ;;
-     *)
diff --git a/srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch b/srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch
deleted file mode 100644
index 93e8c83f9337..000000000000
--- a/srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 34d8f3fb025e930450ce44f7aac501da4c2adc9c
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date:   Sun Jan 23 21:09:42 2022 +0100
-
-    disable spidermonkey jslint
-
-diff --git a/js/src/build/moz.build b/js/src/build/moz.build
-index 55c66b97..243f7db2 100644
---- a/js/src/build/moz.build
-+++ b/js/src/build/moz.build
-@@ -97,15 +97,3 @@ NO_EXPAND_LIBS = True
- 
- DIST_INSTALL = True
- 
--# Run SpiderMonkey style checker after linking the static library. This avoids
--# running the script for no-op builds.
--GeneratedFile(
--    "spidermonkey_checks",
--    script="/config/run_spidermonkey_checks.py",
--    inputs=[
--        "!%sjs_static.%s" % (CONFIG["LIB_PREFIX"], CONFIG["LIB_SUFFIX"]),
--        "/config/check_spidermonkey_style.py",
--        "/config/check_macroassembler_style.py",
--        "/config/check_js_opcode.py",
--    ],
--)
diff --git a/srcpkgs/mozjs91/patches/014-rust-target.patch b/srcpkgs/mozjs91/patches/014-rust-target.patch
deleted file mode 100644
index 4d8918a2a54c..000000000000
--- a/srcpkgs/mozjs91/patches/014-rust-target.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 34b3ac3195a40757bc5f51a1db5a47a4b18c68b5
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date:   Sun Jan 23 21:13:38 2022 +0100
-
-    bypass rust triplet checks and just force ours
-
-diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
-index cd77d72b..0c03cab7 100644
---- a/build/moz.configure/rust.configure
-+++ b/build/moz.configure/rust.configure
-@@ -261,7 +261,7 @@ def rust_supported_targets(rustc):
-         data.setdefault(key, []).append(namespace(rust_target=t, target=info))
-     return data
- 
--
-+@imports("os")
- def detect_rustc_target(
-     host_or_target, compiler_info, arm_target, rust_supported_targets
- ):
-@@ -383,7 +383,7 @@ def detect_rustc_target(
- 
-         return None
- 
--    rustc_target = find_candidate(candidates)
-+    rustc_target = os.environ["RUST_TARGET"]
- 
-     if rustc_target is None:
-         die("Don't know how to translate {} for rustc".format(host_or_target.alias))
diff --git a/srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch b/srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch
deleted file mode 100644
index e2b340cd060e..000000000000
--- a/srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-drop some rust compiler validation
-
---- a/build/moz.configure/rust.configure
-+++ b/build/moz.configure/rust.configure
-@@ -91,9 +91,6 @@ def unwrap_rustup(prog, name):
-     return unwrap
- 
- 
--rustc = unwrap_rustup(rustc, "rustc")
--cargo = unwrap_rustup(cargo, "cargo")
--
- 
- set_config("CARGO", cargo)
- set_config("RUSTC", rustc)
-@@ -411,35 +408,6 @@ def assert_rust_compile(host_or_target, rustc_target, rustc):
- 
-         os.write(in_fd, ensure_binary(source))
-         os.close(in_fd)
--
--        cmd = [
--            rustc,
--            "--crate-type",
--            "staticlib",
--            target_arg,
--            "-o",
--            out_path,
--            in_path,
--        ]
--
--        def failed():
--            die(
--                dedent(
--                    """\
--            Cannot compile for {} with {}
--            The target may be unsupported, or you may not have
--            a rust std library for that target installed. Try:
--
--              rustup target add {}
--            """.format(
--                        host_or_target.alias, rustc, rustc_target
--                    )
--                )
--            )
--
--        check_cmd_output(*cmd, onerror=failed)
--        if not os.path.exists(out_path) or os.path.getsize(out_path) == 0:
--            failed()
-     finally:
-         os.remove(in_path)
-         os.remove(out_path)
-@@ -462,29 +430,6 @@ def rust_host_triple(
-     rustc_target = detect_rustc_target(
-         host, compiler_info, arm_target, rust_supported_targets
-     )
--    if rustc_target != rustc_host:
--        if host.alias == rustc_target:
--            configure_host = host.alias
--        else:
--            configure_host = "{}/{}".format(host.alias, rustc_target)
--        die(
--            dedent(
--                """\
--        The rust compiler host ({rustc}) is not suitable for the configure host ({configure}).
--
--        You can solve this by:
--        * Set your configure host to match the rust compiler host by editing your
--        mozconfig and adding "ac_add_options --host={rustc}".
--        * Or, install the rust toolchain for {configure}, if supported, by running
--        "rustup default stable-{rustc_target}"
--        """.format(
--                    rustc=rustc_host,
--                    configure=configure_host,
--                    rustc_target=rustc_target,
--                )
--            )
--        )
--    assert_rust_compile(host, rustc_target, rustc)
-     return rustc_target
- 
- 
diff --git a/srcpkgs/mozjs91/patches/017-no-lto-readelf.patch b/srcpkgs/mozjs91/patches/017-no-lto-readelf.patch
deleted file mode 100644
index 24075c591ff4..000000000000
--- a/srcpkgs/mozjs91/patches/017-no-lto-readelf.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 1cc729c5221d0ce4c80786ccdcb2de4a6ca382b6
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date:   Sun Jan 23 21:55:43 2022 +0100
-
-    drop some library checks
-    
-    This calls readelf and won't work with LTO'd setups.
-
-diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
-index 401c2933..ade4f1da 100644
---- a/config/makefiles/rust.mk
-+++ b/config/makefiles/rust.mk
-@@ -405,22 +405,6 @@ force-cargo-library-build:
- 	$(call CARGO_BUILD) --lib $(cargo_target_flag) $(rust_features_flag) -- $(cargo_rustc_flags)
- 
- $(RUST_LIBRARY_FILE): force-cargo-library-build
--# When we are building in --enable-release mode; we add an additional check to confirm
--# that we are not importing any networking-related functions in rust code. This reduces
--# the chance of proxy bypasses originating from rust code.
--# The check only works when rust code is built with -Clto but without MOZ_LTO_RUST_CROSS.
--# Sanitizers and sancov also fail because compiler-rt hooks network functions.
--ifndef MOZ_PROFILE_GENERATE
--ifeq ($(OS_ARCH), Linux)
--ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN))
--ifndef MOZ_LTO_RUST_CROSS
--ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
--	$(call py_action,check_binary,--target --networking $@)
--endif
--endif
--endif
--endif
--endif
- 
- force-cargo-library-check:
- 	$(call CARGO_CHECK) --lib $(cargo_target_flag) $(rust_features_flag)
diff --git a/srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch b/srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch
deleted file mode 100644
index 4a9b0b42a575..000000000000
--- a/srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/config/makefiles/rust.mk
-+++ b/config/makefiles/rust.mk
-@@ -64,6 +64,7 @@ endif
- # These flags are passed via `cargo rustc` and only apply to the final rustc
- # invocation (i.e., only the top-level crate, not its dependencies).
- cargo_rustc_flags = $(CARGO_RUSTCFLAGS)
-+ifneq (1,$(MOZ_NO_RUST_LTO))
- ifndef DEVELOPER_OPTIONS
- ifndef MOZ_DEBUG_RUST
- # Enable link-time optimization for release builds, but not when linking
-@@ -77,6 +78,7 @@ RUSTFLAGS += -Cembed-bitcode=yes
- endif
- endif
- endif
-+endif
- 
- ifdef CARGO_INCREMENTAL
- export CARGO_INCREMENTAL
diff --git a/srcpkgs/mozjs91/patches/fix-build-ppc32.patch b/srcpkgs/mozjs91/patches/fix-build-ppc32.patch
deleted file mode 100644
index 066330731e5e..000000000000
--- a/srcpkgs/mozjs91/patches/fix-build-ppc32.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 32e52128ce8fe7704a29a5a4fb921a8394540fbc
-Author: q66 <daniel@octaforge.org>
-Date:   Mon Jun 13 14:01:59 2022 +0200
-
-    fix ftbfs on powerpc32
-
-diff --git a/js/src/wasm/WasmFrame.h b/js/src/wasm/WasmFrame.h
-index 85f2612d..df5c9629 100644
---- a/js/src/wasm/WasmFrame.h
-+++ b/js/src/wasm/WasmFrame.h
-@@ -230,7 +230,7 @@ class DebugFrame {
-   // Avoid -Wunused-private-field warnings.
-  protected:
- #if defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_ARM) || \
--    defined(JS_CODEGEN_X86) || defined(__wasi__)
-+    defined(JS_CODEGEN_X86) || defined(__wasi__) || (defined(__powerpc__) && !defined(__powerpc64__))
-   // See alignmentStaticAsserts().  For MIPS32, ARM32 and X86 DebugFrame is only
-   // 4-byte aligned, so we add another word to get up to 8-byte
-   // alignment.
diff --git a/srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch b/srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch
deleted file mode 100644
index 831e5e03678d..000000000000
--- a/srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# error: typedef redefinition with different types ('__double_t' (aka 'double') vs 'long double')
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1729459
-
---- a/modules/fdlibm/src/math_private.h
-+++ b/modules/fdlibm/src/math_private.h
-@@ -30,7 +30,12 @@
-  * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
-  */
- 
-+#if defined(__linux__) && defined(__i386__)
-+// rely on glibc's double_t
-+typedef long double __double_t;
-+#else
- typedef double      __double_t;
-+#endif
- typedef __double_t  double_t;
- 
- /*
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 73fcd54ee76b..116a32cd1971 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -1,98 +1,13 @@
-# Template file for 'mozjs91' 
+# Template file for 'mozjs60'
 pkgname=mozjs91
 version=91.7.1
-revision=2
-build_wrksrc=js/src
-build_style=gnu-configure
-build_helper=rust
-make_check_target=check-jit-test
-configure_args="--disable-jemalloc --disable-strip --disable-tests \
- --disable-optimize --disable-debug --enable-ctypes --enable-readline \
- --enable-shared-js --enable-system-ffi --with-intl-api --with-system-icu \
- --with-system-nspr --with-system-zlib --enable-hardening --enable-release"
-hostmakedepends="make pkg-config python3 python3-setuptools python3-six perl m4
- rust cargo llvm12 clang"
-makedepends="icu-devel libffi-devel nspr-devel python3-devel readline-devel
- zlib-devel rust-std"
-checkdepends=python3
-short_desc="SpiderMonkey JavaScript interpreter and library (91.x)"
+revision=3
+build_style=meta
+short_desc="Mozilla JavaScript interpreter and library (91.x series) (removed package)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="MPL-2.0"
-homepage="https://spidermonkey.dev"
-distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=57494a445e72f7eacb0bb870a3a79cde3c2143e234873c0c3e269df1d4742c92
-
-LDFLAGS="-Wl,-z,stack-size=1048576"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	LDFLAGS+=" -latomic"
-fi
-
-if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
-	# Disable LTO on i686, otherwise compilation of `jsrust` fails with -
-	# 	error: ran out of registers during register allocation
-	# 	LLVM ERROR: Cannot emit physreg copy instruction
-	# 	error: could not compile `jsrust` due to previous error
-	export MOZ_NO_RUST_LTO=1
-fi
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		configure_args+=" --host=${XBPS_TRIPLET} --target=${XBPS_CROSS_TRIPLET} --enable-linker=bfd"
-	fi
-	export M4=m4
-	export AWK=awk
-	export AC_MACRODIR=../../build/autoconf
-	chmod 0755 ../../build/autoconf/autoconf.sh
-	sh ../../build/autoconf/autoconf.sh configure.in > configure
-	chmod 0755 configure
-}
-
-post_install() {
-	# Remove unneeded static library
-	rm -f "${DESTDIR}"/usr/lib/*.ajs
-
-	# it has correct soname but not the right file name
-	mv "${DESTDIR}"/usr/lib/libmozjs-91.so \
-	   "${DESTDIR}"/usr/lib/libmozjs-91.so.0
-	ln -rs "${DESTDIR}"/usr/lib/libmozjs-91.so.0 \
-	       "${DESTDIR}"/usr/lib/libmozjs-91.so
-}
-
-pre_check() {
-	if [ "$XBPS_WORDSIZE" = 32 ]; then
-		vsed -i jit-test/tests/basic/bug653153.js -e s/65536/65568/g
-		vsed -i jit-test/tests/basic/bug653153.js -e s/65537/65569/g
-	fi
-	if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
-		export JITTEST_EXTRA_ARGS="${JITTEST_EXTRA_ARGS} \
-			-x basic/fdlibm-for-sin-cos-tan-argument.js \
-			-x gc/gcparam.js \
-			-x ion/dce-with-rinstructions.js \
-			-x sunspider/check-3d-cube.js \
-			-x sunspider/check-3d-raytrace.js \
-			-x sunspider/check-access-nbody.js \
-			-x wasm/nan-semantics.js \
-			-x wasm/spec/spec/float_literals.wast.js \
-			-x wasm/spec/spec/float_memory.wast.js \
-			-x wasm/spec/threads/float_memory.wast.js \
-			"
-	fi
-	if [ "$XBPS_LIBC" = musl ]; then
-		export JITTEST_EXTRA_ARGS="${JITTEST_EXTRA_ARGS} \
-			-x sunspider/check-date-format-tofte.js \
-			"
-	fi
-}
+license="metapackage"
+homepage="https://www.mozilla.org/firefox/"
 
 mozjs91-devel_package() {
-	depends="nspr-devel ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/js91-config
-		vmove usr/include
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-	}
+	build_style=meta
 }

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2023-01-22 22:29 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-18 21:34 [PR PATCH] mozjs91: remove package Johnnynator
2023-01-18 21:36 ` classabbyamp
2023-01-18 21:55 ` oreo639
2023-01-18 21:56 ` oreo639
2023-01-18 21:57 ` oreo639
2023-01-22 22:29 ` [PR PATCH] [Closed]: " Johnnynator
  -- strict thread matches above, loose matches on Subject: below --
2022-12-26  8:47 [PR PATCH] " oreo639

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).