commit: 776cb2bcedc5874c447b8082393473f20bab5790 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Aug 10 07:34:50 2022 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Wed Aug 10 08:31:03 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=776cb2bc
dev-lang/spidermonkey: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/26802 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> dev-lang/spidermonkey/Manifest | 2 - .../files/spidermonkey-1.8.5-LTO.patch | 58 -------- .../spidermonkey-perl-defined-array-check.patch | 11 -- .../spidermonkey/spidermonkey-1.8.5-r10.ebuild | 152 --------------------- 4 files changed, 223 deletions(-) diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest index 9f8ababee072..294377e9f668 100644 --- a/dev-lang/spidermonkey/Manifest +++ b/dev-lang/spidermonkey/Manifest @@ -5,10 +5,8 @@ DIST firefox-78esr-patches-19.tar.xz 88424 BLAKE2B fdc7bf8f28b3e799551a70f1cec7a DIST firefox-91.11.0esr.source.tar.xz 384459848 BLAKE2B cff327378a1712d0dfb99e1a67bd63e958987e3147279af5f98ee9318fe91f42823bbc9afb0308638e42de789451b04ea895320a8c674cc221e0d4b0b1d80f38 SHA512 bff3a399c03bd1cdaaec0b6963b1558aa35b6338b6c02042ffd65fec0aedd344d01718692e881332f5f352c32da15ba09a20a09ee072200b47ae840bc0585a96 DIST firefox-91.12.0esr.source.tar.xz 379877004 BLAKE2B c00e5cc219c59d8347a69e5236a4a4f439d9caae6ab7dabc3ed8c8f9a096ded26ec1ffb53b015b86481f1d43ec4f263bb8acbd841ebf36e8a741d73e12a0a914 SHA512 323fb752488b45872b40f0b0ee1d8c1dffa16874dbff2afde19a54286c824ef48177233e029faeafa5946184e71c31c6bc5ba7ec17a571e21af64fc5f7334042 DIST firefox-91esr-patches-10j.tar.xz 18320 BLAKE2B ec882411eed19bafab8676e3d79f4ae43947bb97c44571c1497bb93a44fcfec99de06ebacbdf8c4944dcecdf949e4f684908d7ce4226cdcec60241e62e75810e SHA512 670a14d852bb74b9074c3fef9310650f71ce1c56314109c49aea02a7a69acc836af60a8beab11da53e21b10a8e6da341fcfa18b68a1dfd33b26978dd63758e9c -DIST js185-1.0.0.tar.gz 6164605 BLAKE2B 76a37f0ceae05d3475853875bd0ce4be6e525e4114816f8f281ea6fc6b60a71060975a0fa1cb843f57ad1e2f842dfb26b24244fa0fd6c20f6ae2ebbe430f70be SHA512 2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718 DIST mozjs-60.5.2.tar.bz2 32816585 BLAKE2B 45ac4c9646e1275faf60eeedbf486f802cd106583eb7f640fe2243adc7cbb811dced5cefa94426cceca63468b0112be84078ffcef24cb2b8c1a7b6c8173c0d45 SHA512 5fb73330e7803bdd524fbe7cfdf4e6b72e85d4b22b0c827400317b5d052d1088d36e558ceac376393089e9d03e658b24e69262851fc04a66bbcda47135423dc0 DIST spidermonkey-60.0-patches-04.tar.xz 4428 BLAKE2B af78049cd9b3ee6a9b689e6253486c4670fd3b506faade7d745dafaa7af329c0bd15cd35e95528a4c96688230f4803130967fb09b97aae2bda0ce0f73acaaf3e SHA512 fb1326a81512146ba98773d4f7e0c4bc1bff0f076897c13f576fcf63b56f6965efeff633eea9160bca9f9bc4546505901084eabc33bc955de0b7ab3d6334387a DIST spidermonkey-68.6.0-patches-04.tar.xz 5956 BLAKE2B b1250391a5173e676272d5926b710c06b0e9de1ff03b130a57fdac30f2deefbee3fa92250b37e28087572fe5cce73eb112ef4e1fb0c0401d6ecdb22ab9868998 SHA512 94575b11b4f006c6ee0c8d64b315734a173cecb68e9128ca61ba1a28177e3c149b8cf1f3b3c47a7a263fad8da6196fc0101df87392f016686a827e0cd24fdc74 DIST spidermonkey-78-patches-04.tar.xz 3408 BLAKE2B f2fdd4882e1e4de1908c458dc8dfedd5665ef7118f19704dabf2b2a80e2fae48813e9bc3d0c3410287e32c21e3f9d09233d8e5d15917f53aa2f60e6190cd9cdb SHA512 87ac83c0ccc05f482913b1fbf043db1878536f935f934362a47283809c0cbfdeff040206a9c18c687384b606ba8a7bd9a7c1fc3c0bcfdd620987990a33ca1fe2 DIST spidermonkey-91-patches-04j.tar.xz 4624 BLAKE2B d9cf47b39a165e8434d4f2f20ae3a9734c1bb81c32ddb75360e5edfa6817d6343be89aff0f8ec381485772cad80b00a069789decbc462129161afc3d4acfcb53 SHA512 bd574fee600cb4c6a262893b7d992d85c4059d512b829cd2f226aff86d8a6a83c2bdab466704e22f64bf6d29f90901037a34f9e90a42251952ba1cdbc0cab968 -DIST spidermonkey-slot0-patches-02.tar.xz 10952 BLAKE2B fb7bf5cdac6c821a48d407ff172fe0ec7297e047d3b3bab952f226f413b83ea70325175b41c1680725ff588111b424efc97a0c66e392989da510c43d38528ff1 SHA512 cd62890c4b58658d99fc1b52f05ccb35c07da835b168bb9d5e6b219de5021122c199cc2255c5b0be01ef582f53dd51c9975921e6bde9f14e9b43536e2bee85f2 diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-LTO.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-LTO.patch deleted file mode 100644 index 7c36b5525b04..000000000000 --- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-LTO.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 6ff7ad09daf98e5b804cf73c066c382a76e74e8c Mon Sep 17 00:00:00 2001 -From: Alexander Miller <[email protected]> -Date: Wed, 12 Jun 2019 00:29:23 -0500 -Subject: [PATCH] Fix breakage with lto builds - -<artificial>:(.text+0x7a): undefined reference to `PopActiveVMFrame' -collect2: error: ld returned 1 exit status - -Signed-off-by: Alexander Miller <[email protected]> ---- - js/src/methodjit/InvokeHelpers.cpp | 2 +- - js/src/methodjit/MethodJIT.cpp | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/js/src/methodjit/InvokeHelpers.cpp b/js/src/methodjit/InvokeHelpers.cpp -index d017c2a..abde396 100644 ---- a/js/src/methodjit/InvokeHelpers.cpp -+++ b/js/src/methodjit/InvokeHelpers.cpp -@@ -500,7 +500,7 @@ stubs::PutActivationObjects(VMFrame &f) - js::PutActivationObjects(f.cx, f.fp()); - } - --extern "C" void * -+extern "C" void * __attribute__((used)) - js_InternalThrow(VMFrame &f) - { - JSContext *cx = f.cx; -diff --git a/js/src/methodjit/MethodJIT.cpp b/js/src/methodjit/MethodJIT.cpp -index 4feefbc..66099e6 100644 ---- a/js/src/methodjit/MethodJIT.cpp -+++ b/js/src/methodjit/MethodJIT.cpp -@@ -120,20 +120,20 @@ static uint32 StubCallsForOp[STUB_CALLS_FOR_OP_COUNT]; - - extern "C" void JaegerTrampolineReturn(); - --extern "C" void JS_FASTCALL -+extern "C" void JS_FASTCALL __attribute__((used)) - PushActiveVMFrame(VMFrame &f) - { - f.entryfp->script()->compartment->jaegerCompartment->pushActiveFrame(&f); - f.regs.fp->setNativeReturnAddress(JS_FUNC_TO_DATA_PTR(void*, JaegerTrampolineReturn)); - } - --extern "C" void JS_FASTCALL -+extern "C" void JS_FASTCALL __attribute__((used)) - PopActiveVMFrame(VMFrame &f) - { - f.entryfp->script()->compartment->jaegerCompartment->popActiveFrame(); - } - --extern "C" void JS_FASTCALL -+extern "C" void JS_FASTCALL __attribute__((used)) - SetVMFrameRegs(VMFrame &f) - { - f.cx->setCurrentRegs(&f.regs); --- -2.22.0 - diff --git a/dev-lang/spidermonkey/files/spidermonkey-perl-defined-array-check.patch b/dev-lang/spidermonkey/files/spidermonkey-perl-defined-array-check.patch deleted file mode 100644 index c3996ae82bb3..000000000000 --- a/dev-lang/spidermonkey/files/spidermonkey-perl-defined-array-check.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/js/src/config/milestone.pl 2013-02-11 17:33:22.000000000 -0500 -+++ b/js/src/config/milestone.pl 2015-07-15 10:44:31.676153600 -0400 -@@ -55,7 +55,7 @@ - # - my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE); - --if (defined(@TEMPLATE_FILE)) { -+if (@TEMPLATE_FILE) { - my $TFILE; - - foreach $TFILE (@TEMPLATE_FILE) { diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild deleted file mode 100644 index 99ebd7b97664..000000000000 --- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -WANT_AUTOCONF="2.1" -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads(+)" -inherit autotools toolchain-funcs multilib python-any-r1 versionator pax-utils - -MY_PN="js" -TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))" -MY_P="${MY_PN}-${PV}" -TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0" -DESCRIPTION="Stand-alone JavaScript C library" -HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"; -SRC_URI="https://archive.mozilla.org/pub/js/${TARBALL_P}.tar.gz - https://dev.gentoo.org/~axs/distfiles/${PN}-slot0-patches-02.tar.xz - " - -LICENSE="NPL-1.1" -SLOT="0/mozjs185" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~x64-macos" -IUSE="debug minimal static-libs test" -RESTRICT="!test? ( test )" - -S="${WORKDIR}/${MY_P}" -BUILDDIR="${S}/js/src" - -RDEPEND=">=dev-libs/nspr-4.7.0 - sys-libs/readline:0= - x64-macos? ( dev-libs/jemalloc )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - app-arch/zip - virtual/pkgconfig" - -PATCHES=( - "${WORKDIR}"/sm0/${P}-fix-install-symlinks.patch - "${WORKDIR}"/sm0/${P}-fix-ppc64.patch - "${WORKDIR}"/sm0/${P}-arm_respect_cflags-3.patch - "${WORKDIR}"/sm0/${PN}-1.8.7-freebsd-pthreads.patch - "${WORKDIR}"/sm0/${P}-perf_event-check.patch - "${WORKDIR}"/sm0/${P}-symbol-versions.patch - "${WORKDIR}"/sm0/${P}-ia64-fix.patch - "${WORKDIR}"/sm0/${P}-ia64-static-strings.patch - "${WORKDIR}"/sm0/${P}-isfinite.patch - "${FILESDIR}"/${PN}-perl-defined-array-check.patch - "${WORKDIR}"/sm0/${PN}-1.8.7-x32.patch - "${WORKDIR}"/sm0/${P}-gcc6.patch - "${WORKDIR}"/sm0/${P}-drop-asm-volatile-toplevel.patch - "${FILESDIR}"/${P}-LTO.patch -) - -DOCS=( "${S}"/README ) -HTML_DOCS=( "${BUILDDIR}"/README.html ) - -pkg_setup() { - if [[ ${MERGE_TYPE} != "binary" ]]; then - export LC_ALL="C" - fi -} - -src_prepare() { - pwd - - default - - cd "${BUILDDIR}" || die - eautoconf - - # remove options that are not correct from js-config - sed '/lib-filenames/d' -i "${BUILDDIR}"/js-config.in || die "failed to remove invalid option from js-config" -} - -src_configure() { - cd "${BUILDDIR}" || die - - CC="$(tc-getCC)" CXX="$(tc-getCXX)" \ - AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \ - LD="$(tc-getLD)" \ - ac_cv_lib_dnet_dnet_ntoa=no \ - ac_cv_lib_dnet_stub_dnet_ntoa=no \ - econf \ - ${myopts} \ - --enable-jemalloc \ - --enable-readline \ - --enable-threadsafe \ - --with-system-nspr \ - --disable-optimize \ - --disable-profile-guided-optimization \ - $(use_enable debug) \ - $(use_enable static-libs static) \ - $(use_enable test tests) -} - -cross_make() { - emake \ - CFLAGS="${BUILD_CFLAGS}" \ - CXXFLAGS="${BUILD_CXXFLAGS}" \ - AR="${BUILD_AR}" \ - CC="${BUILD_CC}" \ - CXX="${BUILD_CXX}" \ - RANLIB="${BUILD_RANLIB}" \ - "$@" -} -src_compile() { - cd "${BUILDDIR}" || die - if tc-is-cross-compiler; then - tc-export_build_env BUILD_{AR,CC,CXX,RANLIB} - cross_make jscpucfg host_jsoplengen host_jskwgen - cross_make -C config nsinstall - mv {,native-}jscpucfg || die - mv {,native-}host_jskwgen || die - mv {,native-}host_jsoplengen || die - mv config/{,native-}nsinstall || die - sed -i \ - -e 's@./jscpucfg@./native-jscpucfg@' \ - -e 's@./host_jskwgen@./native-host_jskwgen@' \ - -e 's@./host_jsoplengen@./native-host_jsoplengen@' \ - Makefile || die - sed -i -e 's@/nsinstall@/native-nsinstall@' config/config.mk || die - rm -f config/host_nsinstall.o \ - config/host_pathsub.o \ - host_jskwgen.o \ - host_jsoplengen.o || die - fi - emake -} - -src_test() { - cd "${BUILDDIR}/jsapi-tests" || die - # for bug 415791 - pax-mark mr jsapi-tests - emake check -} - -src_install() { - cd "${BUILDDIR}" || die - emake DESTDIR="${D}" install - # bug 437520 , exclude js shell for small systems - if ! use minimal ; then - dobin shell/js - pax-mark m "${ED}/usr/bin/js" - fi - einstalldocs - - if ! use static-libs; then - # We can't actually disable building of static libraries - # They're used by the tests and in a few other places - find "${D}" -iname '*.a' -delete || die - fi -}
