From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 869A2158020 for ; Thu, 24 Nov 2022 07:21:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47365E0900; Thu, 24 Nov 2022 07:21:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 185F1E0900 for ; Thu, 24 Nov 2022 07:21:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E5D15340F8E for ; Thu, 24 Nov 2022 07:21:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2159B762 for ; Thu, 24 Nov 2022 07:21:15 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1669274441.c971a7deb51fd332abae53ae2dd3d37232e13750.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/spidermonkey/files/, dev-lang/spidermonkey/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/spidermonkey/Manifest dev-lang/spidermonkey/files/spidermonkey-68.0-add-riscv-support.patch dev-lang/spidermonkey/files/spidermonkey-68.0-loong-support.patch dev-lang/spidermonkey/spidermonkey-68.12.0-r1.ebuild X-VCS-Directories: dev-lang/spidermonkey/files/ dev-lang/spidermonkey/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c971a7deb51fd332abae53ae2dd3d37232e13750 X-VCS-Branch: master Date: Thu, 24 Nov 2022 07:21:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 32d960be-1101-4857-ba2c-68e25ec57852 X-Archives-Hash: 7ba9022204d6fc848da1bad6446da4ec commit: c971a7deb51fd332abae53ae2dd3d37232e13750 Author: Sam James gentoo org> AuthorDate: Thu Nov 24 03:14:56 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Nov 24 07:20:41 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c971a7de dev-lang/spidermonkey: drop 68.12.0-r1 Signed-off-by: Sam James gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/28407 Signed-off-by: Sam James gentoo.org> dev-lang/spidermonkey/Manifest | 3 - .../spidermonkey-68.0-add-riscv-support.patch | 107 -------- .../files/spidermonkey-68.0-loong-support.patch | 103 -------- .../spidermonkey/spidermonkey-68.12.0-r1.ebuild | 273 --------------------- 4 files changed, 486 deletions(-) diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest index b1f9a6224d7b..fd5d7d56691a 100644 --- a/dev-lang/spidermonkey/Manifest +++ b/dev-lang/spidermonkey/Manifest @@ -1,14 +1,11 @@ DIST firefox-102.4.0esr.source.tar.xz 482118312 BLAKE2B dadb293edf4df20da5345aab6845ca9da8143a966b38d3660ea8ebc4f24ecab72097ba4345d30895907c83895883379867437f8097b86af4e7e0e691da551793 SHA512 30d9e6ef04fd86516e2cea3c797ec99af4c96b08576bb3409c0026da4fd1218167f89a007109e1fa4e2571f98f2dbe5ab58a26473533d45301f75b90ec3dbf28 DIST firefox-102.5.0esr.source.tar.xz 478705384 BLAKE2B ee005b0e75151e39a9f34ab38a7a704a1f2efd4fe33bacb6a604a8a6ce8727210d0794b81e03e448d5baa2be264a7150728aac4f5b86d0a5154d549abf0c75ac SHA512 f4e105209c61e9537ddc90afdb05ede0a31caceb9b164d96276c811abbd646d14bc246c00caa386c0b0561055096d30b298329c69270dd085b943bdbc3a91a13 DIST firefox-102esr-patches-04j.tar.xz 21860 BLAKE2B 1cc1d6493912f85e71cb5a0ec2c3196cda203242f3503bb6ce8c23a93e71a6e8b1138f88498a6a9698066134cc234989b35cb378693fb2cbc9ba4caa8d66761d SHA512 9f7188dd79b9856826ae2a60b0109c2c86c60c10b03cd1828a9f7a7576df5c49ed3e11e4d3319d80e117204d6bc3408e375a62ad16ec8d2e53f999cd298811d8 -DIST firefox-68.0-patches-15.tar.xz 16060 BLAKE2B f9e6cd58ea51bed1af90a9d30fd551dc7e939afcd1b4d00de1271bd4bda94021c6f1799fd9945962c14ffa1fd0b6a6429369c4e45efc2000f179b9b2e46971e7 SHA512 9cb2479637dd8b84e0ab68dc0fe144acd2dc74feca282fd3c4b485ca6f0de8190244587622713a5421b243ccda153f738e9a8f463e87e15e93e9b725d943e128 -DIST firefox-68.12.0esr.source.tar.xz 313856956 BLAKE2B eeaa4acc9fabf15ec1b313170a30cee8e1fc10a8b08512b915b83b7d6a81c09b365733ed94638bd434864fd7b0cb8cbf1bc2e43441be69e31117e8e6a099234c SHA512 839b02422e4c87bdb12e0995cd35ca8c1996f3fba00bbb46b419e46b67df5ec48a264cb14632db777ce29166ee4fdcb06e2ee3ce847e64328c58c9a2f9129f4c DIST firefox-78.15.0esr.source.tar.xz 330819568 BLAKE2B dc8785613c2f72c55d484642c89c2545765a9efbd609bc7c2cf57b4a3a06a2ea22e6959e42b5b8af867db782e8b2097a67dec858796b744e47008a8e575e2316 SHA512 ac3de735b246ce4f0e1619cd2664321ffa374240ce6843e785d79a350dc30c967996bbcc5e3b301cb3d822ca981cbea116758fc4122f1738d75ddfd1165b6378 DIST firefox-78esr-patches-19.tar.xz 88424 BLAKE2B fdc7bf8f28b3e799551a70f1cec7a695f52c4712f3b28733648fcd7dac5a599613f4c3d2cfa169266dc62b65619b7f28c0e06d32317adb8ec0056ca79c87e9f6 SHA512 3c81dadc9bf74207c4e361605127ef6141d77700c5c54f1f9cd5ad3be13df9f73c6eec2f51d779558e4bdad1e7395c6aa8943a93415bd1786d461042bc03550a DIST firefox-91.11.0esr.source.tar.xz 384459848 BLAKE2B cff327378a1712d0dfb99e1a67bd63e958987e3147279af5f98ee9318fe91f42823bbc9afb0308638e42de789451b04ea895320a8c674cc221e0d4b0b1d80f38 SHA512 bff3a399c03bd1cdaaec0b6963b1558aa35b6338b6c02042ffd65fec0aedd344d01718692e881332f5f352c32da15ba09a20a09ee072200b47ae840bc0585a96 DIST firefox-91.13.0esr.source.tar.xz 380053584 BLAKE2B 75d0daa512b3a2d41974a0169778be9ef19a100de2bd382add9831860ca93976585a41e760b6a7ec753268fb78f9f61049780fa7961834248bc8157cfdcc2827 SHA512 38b4cc52de21e76d6061e6ba175e1cbfd888a16070aa951f5a44283f2db9d7e94f2504621f0da78feac6e71491a6d0e7038f63dd0ae112dcad700eb02e9aa516 DIST firefox-91esr-patches-10j.tar.xz 18320 BLAKE2B ec882411eed19bafab8676e3d79f4ae43947bb97c44571c1497bb93a44fcfec99de06ebacbdf8c4944dcecdf949e4f684908d7ce4226cdcec60241e62e75810e SHA512 670a14d852bb74b9074c3fef9310650f71ce1c56314109c49aea02a7a69acc836af60a8beab11da53e21b10a8e6da341fcfa18b68a1dfd33b26978dd63758e9c DIST spidermonkey-102-patches-04j.tar.xz 3996 BLAKE2B 468697521adacc5d647b04f2228fc4c1a8131bc2523142f2d57f32e321303581ae8f793baae48966ecb27f48bf77eb084f7b2df1c1a0c667e9ed59ae93d786e6 SHA512 201bb779e2373cc00dfadc29a62b593030dfc12eec076114b92927f29f476d3fafdd056112dd1bb1f19f82827f4fe1252141e3998bec719e4196737a316d4ef2 -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 diff --git a/dev-lang/spidermonkey/files/spidermonkey-68.0-add-riscv-support.patch b/dev-lang/spidermonkey/files/spidermonkey-68.0-add-riscv-support.patch deleted file mode 100644 index cc44da805898..000000000000 --- a/dev-lang/spidermonkey/files/spidermonkey-68.0-add-riscv-support.patch +++ /dev/null @@ -1,107 +0,0 @@ -From f144113688168e2bd86d24a48c8d7cdfdb4ccaab Mon Sep 17 00:00:00 2001 -From: Thomas Deutschmann -Date: Fri, 21 May 2021 17:17:45 +0200 -Subject: [PATCH] bmo#1318905: Make SpiderMonkey build on Linux/RISC-V - -Signed-off-by: Thomas Deutschmann ---- - build/moz.configure/init.configure | 3 +++ - js/src/jit/AtomicOperations.h | 2 +- - js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h | 5 +++++ - mfbt/tests/TestPoisonArea.cpp | 3 +++ - python/mozbuild/mozbuild/configure/constants.py | 2 ++ - .../mozbuild/test/configure/test_toolchain_configure.py | 4 ++++ - 6 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure -index b887153321a..5c275076061 100644 ---- a/build/moz.configure/init.configure -+++ b/build/moz.configure/init.configure -@@ -755,6 +755,9 @@ def split_triplet(triplet, allow_msvc=False): - elif cpu.startswith('aarch64'): - canonical_cpu = 'aarch64' - endianness = 'little' -+ elif cpu in ('riscv64', 'riscv64gc'): -+ canonical_cpu = 'riscv64' -+ endianness = 'little' - elif cpu == 'sh4': - canonical_cpu = 'sh4' - endianness = 'little' -diff --git a/js/src/jit/AtomicOperations.h b/js/src/jit/AtomicOperations.h -index 0f45ac8b58e..f48d2adce97 100644 ---- a/js/src/jit/AtomicOperations.h -+++ b/js/src/jit/AtomicOperations.h -@@ -392,7 +392,7 @@ inline bool AtomicOperations::isLockfreeJS(int32_t size) { - defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \ - defined(__PPC64LE__) || defined(__alpha__) || defined(__hppa__) || \ - defined(__ia64__) || defined(__sh__) || defined(__s390__) || \ -- defined(__s390x__) -+ defined(__s390x__) || defined(__riscv) - # include "jit/shared/AtomicOperations-feeling-lucky.h" - #else - # error "No AtomicOperations support provided for this platform" -diff --git a/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h b/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h -index f002cd46c93..1ce40efaccc 100644 ---- a/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h -+++ b/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h -@@ -63,6 +63,11 @@ - # define HAS_64BIT_LOCKFREE - #endif - -+#if defined(__riscv) && __riscv_xlen == 64 -+# define HAS_64BIT_ATOMICS -+# define HAS_64BIT_LOCKFREE -+#endif -+ - #ifdef __sparc__ - # ifdef __LP64__ - # define HAS_64BIT_ATOMICS -diff --git a/mfbt/tests/TestPoisonArea.cpp b/mfbt/tests/TestPoisonArea.cpp -index fbd33647150..9d2ffa498b7 100644 ---- a/mfbt/tests/TestPoisonArea.cpp -+++ b/mfbt/tests/TestPoisonArea.cpp -@@ -132,6 +132,9 @@ - #elif defined _ARCH_PPC || defined _ARCH_PWR || defined _ARCH_PWR2 - # define RETURN_INSTR 0x4E800020 /* blr */ - -+#elif defined __riscv -+# define RETURN_INSTR 0x80828082 /* ret; ret */ -+ - #elif defined __sparc || defined __sparcv9 - # define RETURN_INSTR 0x81c3e008 /* retl */ - -diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py -index 7542dcdc636..49ef3b857db 100644 ---- a/python/mozbuild/mozbuild/configure/constants.py -+++ b/python/mozbuild/mozbuild/configure/constants.py -@@ -49,6 +49,7 @@ - 'mips64': 64, - 'ppc': 32, - 'ppc64': 64, -+ 'riscv64': 64, - 's390': 32, - 's390x': 64, - 'sh4': 32, -@@ -87,6 +88,7 @@ - ('sparc', '__sparc__'), - ('mips64', '__mips64'), - ('mips32', '__mips__'), -+ ('riscv64', '__riscv && __riscv_xlen == 64'), - ('sh4', '__sh__'), - )) - -diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py -index 37c4e26f0fb..5d3d5891dca 100755 ---- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py -+++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py -@@ -1208,6 +1208,10 @@ class LinuxCrossCompileToolchainTest(BaseToolchainTest): - 'mips-unknown-linux-gnu': big_endian + { - '__mips__': 1, - }, -+ 'riscv64-unknown-linux-gnu': little_endian + { -+ '__riscv': 1, -+ '__riscv_xlen': 64, -+ }, - 'sh4-unknown-linux-gnu': little_endian + { - '__sh__': 1, - }, diff --git a/dev-lang/spidermonkey/files/spidermonkey-68.0-loong-support.patch b/dev-lang/spidermonkey/files/spidermonkey-68.0-loong-support.patch deleted file mode 100644 index f7010d5ebf32..000000000000 --- a/dev-lang/spidermonkey/files/spidermonkey-68.0-loong-support.patch +++ /dev/null @@ -1,103 +0,0 @@ -https://raw.githubusercontent.com/xen0n/loongson-overlay/00901fd4c599ec320c7852cbd30b40d3f6aa8971/dev-lang/spidermonkey/files/spidermonkey-68.0-add-loongarch64-support.patch - ---- a/build/moz.configure/init.configure -+++ b/build/moz.configure/init.configure -@@ -734,6 +734,9 @@ def split_triplet(triplet, allow_unknown - elif cpu == 'sh4': - canonical_cpu = 'sh4' - endianness = 'little' -+ elif cpu == 'loongarch64': -+ canonical_cpu = 'loongarch64' -+ endianness = 'little' - elif allow_unknown: - canonical_cpu = cpu - endianness = 'unknown' ---- a/js/src/jit/AtomicOperations.h -+++ b/js/src/jit/AtomicOperations.h -@@ -382,6 +382,9 @@ inline bool AtomicOperations::isLockfree - # else - # include "jit/shared/AtomicOperations-feeling-lucky.h" - # endif -+#elif defined(__loongarch64) -+// This is only here to avoid merge conflict with spidermonkey-68.0-add-riscv-support.patch. -+# include "jit/shared/AtomicOperations-feeling-lucky.h" - #elif defined(__mips__) - # if defined(__clang__) || defined(__GNUC__) - # include "jit/mips-shared/AtomicOperations-mips-shared.h" ---- a/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h -+++ b/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h -@@ -57,6 +57,11 @@ - # define HAS_64BIT_LOCKFREE - #endif - -+#ifdef __loongarch64 -+# define HAS_64BIT_ATOMICS -+# define HAS_64BIT_LOCKFREE -+#endif -+ - #if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \ - defined(__PPC64LE__) - # define HAS_64BIT_ATOMICS ---- a/mfbt/tests/TestPoisonArea.cpp -+++ b/mfbt/tests/TestPoisonArea.cpp -@@ -127,6 +127,9 @@ - #elif defined __arm__ || defined _M_ARM - # define RETURN_INSTR 0xE12FFF1E /* bx lr */ - -+#elif defined __loongarch__ -+# define RETURN_INSTR 0x4c000020 /* jirl zero, ra, 0 */ -+ - // PPC has its own style of CPU-id #defines. There is no Windows for - // PPC as far as I know, so no _M_ variant. - #elif defined _ARCH_PPC || defined _ARCH_PWR || defined _ARCH_PWR2 ---- a/python/mozbuild/mozbuild/configure/constants.py -+++ b/python/mozbuild/mozbuild/configure/constants.py -@@ -46,6 +46,7 @@ CPU_bitness = { - 'arm': 32, - 'hppa': 32, - 'ia64': 64, -+ 'loongarch64': 64, - 'mips32': 32, - 'mips64': 64, - 'ppc': 32, -@@ -78,6 +79,7 @@ CPU_preprocessor_checks = OrderedDict(( - ('arm', '__arm__ || _M_ARM'), - ('aarch64', '__aarch64__ || _M_ARM64'), - ('ia64', '__ia64__'), -+ ('loongarch64', '__loongarch64'), - ('s390x', '__s390x__'), - ('s390', '__s390__'), - ('ppc64', '__powerpc64__'), ---- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py -+++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py -@@ -1068,6 +1068,10 @@ class LinuxCrossCompileToolchainTest(Bas - 'ia64-unknown-linux-gnu': little_endian + { - '__ia64__': 1, - }, -+ 'loongarch64-unknown-linux-gnu': little_endian + { -+ '__loongarch__': 1, -+ '__loongarch64': 1, -+ }, - 's390x-unknown-linux-gnu': big_endian + { - '__s390x__': 1, - '__s390__': 1, ---- a/intl/icu/source/i18n/double-conversion-utils.h -+++ b/intl/icu/source/i18n/double-conversion-utils.h -@@ -117,6 +117,7 @@ int main(int argc, char** argv) { - #if defined(_M_X64) || defined(__x86_64__) || \ - defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ - defined(__hppa__) || defined(__ia64__) || \ -+ defined(__loongarch__) || \ - defined(__mips__) || \ - defined(__nios2__) || defined(__ghs) || \ - defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ ---- a/mfbt/double-conversion/double-conversion/utils.h -+++ b/mfbt/double-conversion/double-conversion/utils.h -@@ -117,6 +117,7 @@ int main(int argc, char** argv) { - #if defined(_M_X64) || defined(__x86_64__) || \ - defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ - defined(__hppa__) || defined(__ia64__) || \ -+ defined(__loongarch__) || \ - defined(__mips__) || \ - defined(__nios2__) || defined(__ghs) || \ - defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ diff --git a/dev-lang/spidermonkey/spidermonkey-68.12.0-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-68.12.0-r1.ebuild deleted file mode 100644 index fa5485814854..000000000000 --- a/dev-lang/spidermonkey/spidermonkey-68.12.0-r1.ebuild +++ /dev/null @@ -1,273 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="ssl" - -WANT_AUTOCONF="2.1" - -inherit autotools check-reqs python-any-r1 toolchain-funcs - -MY_PN="mozjs" -MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases - -MY_MAJOR=$(ver_cut 1) - -MOZ_ESR="1" - -# Convert the ebuild version to the upstream mozilla version -MOZ_PV="${MY_PV/_alpha/a}" # Handle alpha for SRC_URI -MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI -MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI - -if [[ ${MOZ_ESR} == 1 ]] ; then - # ESR releases have slightly different version numbers - MOZ_PV="${MOZ_PV}esr" -fi - -# Patch version -FIREFOX_PATCHSET="firefox-68.0-patches-15" -SPIDERMONKEY_PATCHSET="${PN}-68.6.0-patches-04" - -MOZ_HTTP_URI="https://archive.mozilla.org/pub/firefox/releases" -MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz" - -if [[ "${PV}" == *_rc* ]]; then - MOZ_HTTP_URI="https://archive.mozilla.org/pub/firefox/candidates/${MOZ_PV}-candidates/build${PV##*_rc}" - MOZ_SRC_URI="${MOZ_HTTP_URI}/source/firefox-${MOZ_PV}.source.tar.xz" -fi - -PATCH_URIS=( - https://dev.gentoo.org/~{anarchy,whissi,polynomial-c,axs}/mozilla/patchsets/${FIREFOX_PATCHSET}.tar.xz - https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${SPIDERMONKEY_PATCHSET}.tar.xz -) - -SRC_URI="${MOZ_SRC_URI} - ${PATCH_URIS[@]}" - -DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++" -HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" - -# riscv support requires a patch currently only available in firefox-78 patch sets -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 -riscv sparc x86" - -SLOT="68" -LICENSE="MPL-2.0" -IUSE="cpu_flags_arm_neon debug +jit test" - -RESTRICT="!test? ( test )" - -BDEPEND="dev-lang/python:2.7 - virtual/pkgconfig - test? ( ${PYTHON_DEPS} )" - -DEPEND="dev-libs/icu:= - >=dev-libs/nspr-4.21 - sys-libs/readline:0= - >=sys-libs/zlib-1.2.3" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/firefox-${MY_PV}/js/src" - -pkg_pretend() { - if use test ; then - CHECKREQS_DISK_BUILD="6G" - else - CHECKREQS_DISK_BUILD="5G" - fi - - check-reqs_pkg_pretend -} - -pkg_setup() { - if use test ; then - CHECKREQS_DISK_BUILD="6G" - else - CHECKREQS_DISK_BUILD="5G" - fi - - check-reqs_pkg_setup - - use test && python-any-r1_pkg_setup -} - -src_prepare() { - cd ../.. || die - rm "${WORKDIR}"/firefox/2013_avoid_noinline_on_GCC_with_skcms.patch - rm "${WORKDIR}"/firefox/2015_fix_cssparser.patch - rm "${WORKDIR}"/firefox/2016_set_CARGO_PROFILE_RELEASE_LTO.patch - eapply "${WORKDIR}"/firefox - eapply "${WORKDIR}"/spidermonkey-patches - eapply "${FILESDIR}"/spidermonkey-68.0-add-riscv-support.patch - eapply "${FILESDIR}"/spidermonkey-68.0-loong-support.patch - - default - - # sed-in toolchain prefix - sed -i \ - -e "s/objdump/${CHOST}-objdump/" \ - python/mozbuild/mozbuild/configure/check_debug_ranges.py \ - || die "sed failed to set toolchain prefix" - - MOZJS_BUILDDIR="${WORKDIR}/build" - mkdir "${MOZJS_BUILDDIR}" || die - - cd "${S}" || die - eautoconf -} - -src_configure() { - tc-export CC CXX LD AR RANLIB - - # backup current active Python version - local PYTHON_OLD=${PYTHON} - - # build system will require Python2.7 - export PYTHON=python2.7 - - cd "${MOZJS_BUILDDIR}" || die - - # ../python/mach/mach/mixin/process.py fails to detect SHELL - export SHELL="${EPREFIX}/bin/bash" - - local -a myeconfargs=( - --host="${CBUILD:-${CHOST}}" - --target="${CHOST}" - --disable-jemalloc - --disable-optimize - --disable-strip - --enable-readline - --enable-shared-js - --with-intl-api - --with-system-icu - --with-system-nspr - --with-system-zlib - --with-toolchain-prefix="${CHOST}-" - $(use_enable debug) - $(use_enable jit ion) - $(use_enable test tests) - ) - - # Modifications to better support ARM, bug 717344 - if use cpu_flags_arm_neon ; then - myeconfargs+=( --with-fpu=neon ) - - if ! tc-is-clang ; then - # thumb options aren't supported when using clang, bug 666966 - myeconfargs+=( --with-thumb=yes ) - myeconfargs+=( --with-thumb-interwork=no ) - fi - fi - - # Forcing system-icu allows us to skip patching bundled ICU for PPC - # and other minor arches - ECONF_SOURCE="${S}" \ - econf \ - ${myeconfargs[@]} \ - XARGS="${EPREFIX}/usr/bin/xargs" - - # restore PYTHON - export PYTHON=${PYTHON_OLD} -} - -src_compile() { - cd "${MOZJS_BUILDDIR}" || die - default -} - -src_test() { - if "${MOZJS_BUILDDIR}/js/src/js" -e 'print("Hello world!")'; then - einfo "Smoke-test successful, continuing with full test suite" - else - die "Smoke-test failed: did interpreter initialization fail?" - fi - - local -a KNOWN_TESTFAILURES - KNOWN_TESTFAILURES+=( test262/built-ins/Atomics/wait/bigint/waiterlist-order-of-operations-is-fifo.js ) - KNOWN_TESTFAILURES+=( test262/intl402/RelativeTimeFormat/prototype/format/en-us-numeric-auto.js ) - KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/timeZone_backward_links.js ) - KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/tz-environment-variable.js ) - KNOWN_TESTFAILURES+=( non262/Intl/RelativeTimeFormat/format.js ) - KNOWN_TESTFAILURES+=( non262/Date/time-zones-imported.js ) - KNOWN_TESTFAILURES+=( non262/Date/toString-localized.js ) - KNOWN_TESTFAILURES+=( non262/Date/time-zone-path.js ) - KNOWN_TESTFAILURES+=( non262/Date/time-zones-historic.js ) - KNOWN_TESTFAILURES+=( non262/Date/toString-localized-posix.js ) - KNOWN_TESTFAILURES+=( non262/Date/reset-time-zone-cache-same-offset.js ) - KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/format_timeZone.js ) - KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/format.js ) - KNOWN_TESTFAILURES+=( non262/Intl/Date/toLocaleDateString_timeZone.js ) - KNOWN_TESTFAILURES+=( non262/Intl/Date/toLocaleString_timeZone.js ) - - if use x86 ; then - KNOWN_TESTFAILURES+=( test262/language/types/number/S8.5_A2.1.js ) - KNOWN_TESTFAILURES+=( test262/language/types/number/S8.5_A2.2.js ) - KNOWN_TESTFAILURES+=( test262/built-ins/Number/prototype/toPrecision/return-values.js ) - KNOWN_TESTFAILURES+=( non262/Date/timeclip.js ) - elif use sparc ; then - KNOWN_TESTFAILURES+=( non262/Array/regress-157652.js ) - KNOWN_TESTFAILURES+=( non262/Array/regress-330812.js ) - KNOWN_TESTFAILURES+=( non262/regress/regress-422348.js ) - fi - - if [[ $(tc-endian) == "big" ]] ; then - KNOWN_TESTFAILURES+=( test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js ) - fi - - echo "" > "${T}"/known_failures.list || die - - local KNOWN_TESTFAILURE - for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do - echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list - done - - PYTHONPATH="${S}/tests/lib" \ - ${PYTHON} \ - "${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \ - --exclude-file="${T}"/known_failures.list \ - "${MOZJS_BUILDDIR}"/js/src/js \ - || die - - if use jit ; then - KNOWN_TESTFAILURES=() - - echo "" > "${T}"/known_failures.list || die - - for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do - echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list - done - - PYTHONPATH="${S}/tests/lib" \ - ${PYTHON} \ - "${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \ - --exclude-file="${T}"/known_failures.list \ - "${MOZJS_BUILDDIR}"/js/src/js basic \ - || die - fi -} - -src_install() { - cd "${MOZJS_BUILDDIR}" || die - default - - # fix soname links - pushd "${ED}"/usr/$(get_libdir) &>/dev/null || die - mv lib${MY_PN}-${MY_MAJOR}.so lib${MY_PN}-${MY_MAJOR}.so.0.0.0 || die - ln -s lib${MY_PN}-${MY_MAJOR}.so.0.0.0 lib${MY_PN}-${MY_MAJOR}.so.0 || die - ln -s lib${MY_PN}-${MY_MAJOR}.so.0 lib${MY_PN}-${MY_MAJOR}.so || die - popd &>/dev/null || die - - # remove unneeded files - rm \ - "${ED}"/usr/bin/js${MY_MAJOR}-config \ - "${ED}"/usr/$(get_libdir)/libjs_static.ajs \ - || die - - # fix permissions - chmod -x \ - "${ED}"/usr/$(get_libdir)/pkgconfig/*.pc \ - "${ED}"/usr/include/mozjs-${MY_MAJOR}/js-config.h \ - || die -}