commit:     76b23faa6a49e7e3007033498f0bbc3c5fc20e85
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  3 13:05:56 2025 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jun  3 13:08:49 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76b23faa

dev-lang/spidermonkey: add 115.24.0

Add an updated version for possible security fixes. Mozilla usually stops
supporting the ESR branch 2-3 releases after a new one is out (128 is the
latest one currently, 140 will be out later this month), but 115 has been
receiving some updates until now.

Unfortunately llvm_compat_19 doesn't compile with clang, so not bumping that
for this 115 version.

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-lang/spidermonkey/Manifest                     |   1 +
 .../files/spidermonkey-115-known-test-failures.txt | 108 +++++
 dev-lang/spidermonkey/spidermonkey-115.24.0.ebuild | 473 +++++++++++++++++++++
 3 files changed, 582 insertions(+)

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 270cfbc38c03..86215dd5ecd4 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,6 +1,7 @@
 DIST firefox-102.15.0esr.source.tar.xz 486592324 BLAKE2B 
b70727fa91d0d270673374bebb4745b87f6194191c1c9415547d772811a4a85f79a97e8985877eb5c9beef43fe15bef574172da35935e7024a947919ec11d883
 SHA512 
87db6e32fda215253f9b3bd233ef7fa91a64349310064b8482e5c634f34cbe99a2a111d74d2b9f2a99a0b3b510dbf9039ebe4ccfc176c2554d65bc9cfb508bf9
 DIST firefox-102esr-patches-13.tar.xz 22212 BLAKE2B 
02e9edd071a99abbac02faa11ffce061d5d12d8baa9ce54b51d6bfdbf8160022a1565902d65ca30fe51b5670e509fa921b11a460989933cbb797fcd59d635125
 SHA512 
8b8b0f3789978447a1293fd9acb5c2db3d7e9f724357a0d762b54f7e34d28f11655997ffeafccfe8001a01dd595848d257f90cb983462c405d434cc794216520
 DIST firefox-115.16.0esr.source.tar.xz 515133700 BLAKE2B 
9501b617b346d56f6de975f88974be6fdc3d4a901b2a1b952b6bbf6cc46384084260078d23c52bedff83a65bec4ea5ec78c3bcaac86c78d0b44e796317534840
 SHA512 
b6f93ec3d6acac5df177253c65b833c017e65ed6e78e96ff029098443928d291f6f67164aedb83d80aa28ee9dee305086597798238d3330e35183030e53e3550
+DIST firefox-115.24.0esr.source.tar.xz 507720392 BLAKE2B 
04cfff28d39ce693182f293aefcf176e0700df89d8f70832f1ea8a20950529629a0e01d431d2d122c38f0689943fdce15438751bbe55f7160949a157e694e38a
 SHA512 
5f50d73845ddb61d4acf09223549fd90f2e576a5b21a83fa0521705f637ecbdd6034ea889ceb9ff66d4b6d1224b66e983503bc5b86279f07c15984f7f23d9643
 DIST firefox-115esr-patches-13.tar.xz 51360 BLAKE2B 
a048bfadba989ebbd4c6e3df97d303d6853844e66ed92f5f5f322acf18866218b91d52dbbece63827de283eef855c932d67e329c8d93200aa83f11268a5d1b2f
 SHA512 
186ec72323e621362dcef1bc67c476716aff97dfad701faa9220a7302e798d3cb4ed90d5ea59e3e92f016be29875bb5219787635db99a8848b7c76e4e2e09e90
 DIST firefox-128.10.0esr.source.tar.xz 556644356 BLAKE2B 
8ff5d2301d02ea32dc9c7635bdaecdb2f8a859c9f0a3875d10f9e0531e60768a88a51761e49de34c2c0ade73bf661db2f1bdbf0b72e19783415a23d14a4cc528
 SHA512 
c0f349cba626e6ec16ff0b52b7d21e05681acd1377fd1111992860f8079373f631ff997d833a3596c72a6d8c6e4f1d051927fa719f1d37a72553dcbd5348659c
 DIST firefox-128.10.1esr.source.tar.xz 568752664 BLAKE2B 
6fe2da50fcc49ecd1304bd167fd73dad312ae9364ba7a33fe9216cb4fcdb6f806f637dd6aa8857516fd516366c31e19a6120c56c6568f20b2eb87bb6b5b84fff
 SHA512 
6e7363d8cbecda1cedaf534ac10dc046b5f515399ec754492357e8a558c61ee3389f7bb90aa929dbcb4d6eba041ae1e778a0a8f90aa1e1f939eea517333b6c45

diff --git 
a/dev-lang/spidermonkey/files/spidermonkey-115-known-test-failures.txt 
b/dev-lang/spidermonkey/files/spidermonkey-115-known-test-failures.txt
index 0788f0f2b12d..404cd12e3947 100644
--- a/dev-lang/spidermonkey/files/spidermonkey-115-known-test-failures.txt
+++ b/dev-lang/spidermonkey/files/spidermonkey-115-known-test-failures.txt
@@ -1,45 +1,153 @@
 non262/Date/time-zone-etc_localetime.js
+non262/Date/time-zones-imported.js
+non262/Intl/Array/toLocaleString-number.js
 non262/Intl/Collator/big5han-gb2312han.js
 non262/Intl/Collator/implicithan.js
 non262/Intl/DateTimeFormat/day-period-hour-cycle.js
+non262/Intl/DateTimeFormat/day-period-standalone.js
+non262/Intl/DateTimeFormat/era.js
+non262/Intl/DateTimeFormat/extended-time-zone-names.js
 non262/Intl/DateTimeFormat/fractional-second-digits-append-item.js
+non262/Intl/DateTimeFormat/islamic.js
 non262/Intl/DateTimeFormat/related-year.js
 non262/Intl/DateTimeFormat/timeZone_backzone.js
 non262/Intl/DateTimeFormat/timeZone_version.js
+non262/Intl/DateTimeFormat/tz-environment-variable.js
 non262/Intl/DisplayNames/calendar.js
 non262/Intl/DisplayNames/currency.js
+non262/Intl/DisplayNames/dateTimeField.js
 non262/Intl/DisplayNames/language-dialect.js
 non262/Intl/ListFormat/conjunction-type.js
 non262/Intl/Locale/likely-subtags-generated.js
 non262/Intl/Locale/likely-subtags.js
 non262/Intl/NumberFormat/currency-narrow-symbol.js
+non262/Intl/RelativeTimeFormat/locale-fallback-handling.js
+non262/Intl/TypedArray/toLocaleString.js
 non262/Intl/available-locales-resolved.js
 non262/Intl/available-locales-supported.js
 non262/Intl/supportedValuesOf-timeZones-canonical.js
 non262/Intl/supportedValuesOf-timeZones.js
 test262/built-ins/RegExp/property-escapes/generated/Alphabetic.js
 test262/built-ins/RegExp/property-escapes/generated/Assigned.js
+test262/built-ins/RegExp/property-escapes/generated/Bidi_Mirrored.js
+test262/built-ins/RegExp/property-escapes/generated/Case_Ignorable.js
+test262/built-ins/RegExp/property-escapes/generated/Cased.js
+test262/built-ins/RegExp/property-escapes/generated/Changes_When_Casefolded.js
+test262/built-ins/RegExp/property-escapes/generated/Changes_When_Casemapped.js
+test262/built-ins/RegExp/property-escapes/generated/Changes_When_Lowercased.js
+test262/built-ins/RegExp/property-escapes/generated/Changes_When_NFKC_Casefolded.js
+test262/built-ins/RegExp/property-escapes/generated/Changes_When_Titlecased.js
+test262/built-ins/RegExp/property-escapes/generated/Changes_When_Uppercased.js
+test262/built-ins/RegExp/property-escapes/generated/Dash.js
+test262/built-ins/RegExp/property-escapes/generated/Diacritic.js
+test262/built-ins/RegExp/property-escapes/generated/Emoji.js
+test262/built-ins/RegExp/property-escapes/generated/Emoji_Presentation.js
+test262/built-ins/RegExp/property-escapes/generated/Extender.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Cased_Letter.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Dash_Punctuation.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Decimal_Number.js
 
test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Letter.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Lowercase_Letter.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Mark.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Math_Symbol.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Modifier_Letter.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Nonspacing_Mark.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Number.js
 test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Other.js
 
test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Other_Letter.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Other_Punctuation.js
 
test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Other_Symbol.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Punctuation.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Spacing_Mark.js
 
test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Symbol.js
 
test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Unassigned.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Uppercase_Letter.js
 test262/built-ins/RegExp/property-escapes/generated/Grapheme_Base.js
+test262/built-ins/RegExp/property-escapes/generated/Grapheme_Extend.js
 test262/built-ins/RegExp/property-escapes/generated/IDS_Binary_Operator.js
 test262/built-ins/RegExp/property-escapes/generated/ID_Continue.js
 test262/built-ins/RegExp/property-escapes/generated/ID_Start.js
 test262/built-ins/RegExp/property-escapes/generated/Ideographic.js
+test262/built-ins/RegExp/property-escapes/generated/Lowercase.js
+test262/built-ins/RegExp/property-escapes/generated/Math.js
+test262/built-ins/RegExp/property-escapes/generated/Script_-_Arabic.js
+test262/built-ins/RegExp/property-escapes/generated/Script_-_Balinese.js
 test262/built-ins/RegExp/property-escapes/generated/Script_-_Common.js
+test262/built-ins/RegExp/property-escapes/generated/Script_-_Cyrillic.js
+test262/built-ins/RegExp/property-escapes/generated/Script_-_Egyptian_Hieroglyphs.js
 test262/built-ins/RegExp/property-escapes/generated/Script_-_Han.js
+test262/built-ins/RegExp/property-escapes/generated/Script_-_Kawi.js
+test262/built-ins/RegExp/property-escapes/generated/Script_-_Khitan_Small_Script.js
+test262/built-ins/RegExp/property-escapes/generated/Script_-_Latin.js
+test262/built-ins/RegExp/property-escapes/generated/Script_-_Myanmar.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Adlam.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Arabic.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Armenian.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Avestan.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Balinese.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Bengali.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Bopomofo.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Carian.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Caucasian_Albanian.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Cherokee.js
 
test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Common.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Coptic.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Cyrillic.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Devanagari.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Duployan.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Egyptian_Hieroglyphs.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Elbasan.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Ethiopic.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Georgian.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Glagolitic.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Gothic.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Greek.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Gunjala_Gondi.js
 test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Han.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Hebrew.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Inherited.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Kaithi.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Kannada.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Katakana.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Kawi.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Khitan_Small_Script.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Latin.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Lisu.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Lycian.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Lydian.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Mahajani.js
 
test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Malayalam.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Meroitic_Hieroglyphs.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Mongolian.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Myanmar.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Old_Hungarian.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Old_Permic.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Old_Turkic.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Osage.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Phags_Pa.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Runic.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Samaritan.js
 
test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Sharada.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Shavian.js
 
test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Sinhala.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Syriac.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Tai_Le.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Tangut.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Thai.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Tibetan.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Tifinagh.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Toto.js
 test262/built-ins/RegExp/property-escapes/generated/Sentence_Terminal.js
+test262/built-ins/RegExp/property-escapes/generated/Terminal_Punctuation.js
 test262/built-ins/RegExp/property-escapes/generated/Unified_Ideograph.js
+test262/built-ins/RegExp/property-escapes/generated/Uppercase.js
 test262/built-ins/RegExp/property-escapes/generated/XID_Continue.js
 test262/built-ins/RegExp/property-escapes/generated/XID_Start.js
+test262/intl402/DateTimeFormat/prototype/format/dayPeriod-long-en.js
+test262/intl402/DateTimeFormat/prototype/format/dayPeriod-narrow-en.js
+test262/intl402/DateTimeFormat/prototype/format/dayPeriod-short-en.js
+test262/intl402/DateTimeFormat/prototype/formatToParts/dayPeriod-long-en.js
+test262/intl402/DateTimeFormat/prototype/formatToParts/dayPeriod-narrow-en.js
+test262/intl402/DateTimeFormat/prototype/formatToParts/dayPeriod-short-en.js
 test262/intl402/Intl/supportedValuesOf/timeZones-accepted-by-DateTimeFormat.js
 test262/intl402/Locale/likely-subtags.js

diff --git a/dev-lang/spidermonkey/spidermonkey-115.24.0.ebuild 
b/dev-lang/spidermonkey/spidermonkey-115.24.0.ebuild
new file mode 100644
index 000000000000..e09a48d23300
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-115.24.0.ebuild
@@ -0,0 +1,473 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+# Patch version
+FIREFOX_PATCHSET="firefox-115esr-patches-13.tar.xz"
+SPIDERMONKEY_PATCHSET="spidermonkey-115-patches-02.tar.xz"
+
+LLVM_COMPAT=( 18 )
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,ssl,xml(+)"
+
+RUST_NEEDS_LLVM="1"
+
+WANT_AUTOCONF="2.1"
+
+inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing prefix 
python-any-r1 rust toolchain-funcs
+
+MY_PN="mozjs"
+MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
+
+MY_MAJOR=$(ver_cut 1)
+
+MOZ_ESR=yes
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+       MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+       # Convert the ebuild version to the upstream Mozilla version
+       MOZ_PV="${MOZ_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
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+       # ESR releases have slightly different version numbers
+       MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="firefox"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}";
+
+if [[ ${PV} == *_rc* ]] ; then
+       
MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}";
+fi
+
+PATCH_URIS=(
+       https://dev.gentoo.org/~juippis/mozilla/patchsets/${FIREFOX_PATCHSET}
+       
https://dev.gentoo.org/~juippis/mozilla/patchsets/${SPIDERMONKEY_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> 
${MOZ_P_DISTFILES}.source.tar.xz
+       ${PATCH_URIS[@]}"
+
+DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
+HOMEPAGE="https://spidermonkey.dev 
https://firefox-source-docs.mozilla.org/js/index.html "
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+SLOT="$(ver_cut 1)"
+LICENSE="MPL-2.0"
+IUSE="clang cpu_flags_arm_neon debug +jit lto test"
+
+#RESTRICT="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+       virtual/pkgconfig
+       $(llvm_gen_dep '
+               llvm-core/llvm:${LLVM_SLOT}
+               clang? (
+                       llvm-core/clang:${LLVM_SLOT}
+                       llvm-core/lld:${LLVM_SLOT}
+               )
+       ')
+       test? (
+               $(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
+       )"
+DEPEND=">=dev-libs/icu-73.1:=
+       dev-libs/nspr
+       sys-libs/readline:0=
+       sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/firefox-${MY_PV}/js/src"
+
+llvm_check_deps() {
+       if ! has_version -b "llvm-core/llvm:${LLVM_SLOT}" ; then
+               einfo "llvm-core/llvm:${LLVM_SLOT} is missing! Cannot use LLVM 
slot ${LLVM_SLOT} ..." >&2
+               return 1
+       fi
+
+       if use clang ; then
+               if ! has_version -b "llvm-core/clang:${LLVM_SLOT}" ; then
+                       einfo "llvm-core/clang:${LLVM_SLOT} is missing! Cannot 
use LLVM slot ${LLVM_SLOT} ..." >&2
+                       return 1
+               fi
+
+               if ! tc-ld-is-mold ; then
+                       if ! has_version -b "llvm-core/lld:${LLVM_SLOT}" ; then
+                               einfo "llvm-core/lld:${LLVM_SLOT} is missing! 
Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+                               return 1
+                       fi
+               fi
+       fi
+
+       einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+python_check_deps() {
+       if use test ; then
+               python_has_version "dev-python/six[${PYTHON_USEDEP}]"
+       fi
+}
+
+# This is a straight copypaste from toolchain-funcs.eclass's 'tc-ld-is-lld', 
and is temporarily
+# placed here until toolchain-funcs.eclass gets an official support for mold 
linker.
+# Please see:
+# https://github.com/gentoo/gentoo/pull/28366 ||
+# https://github.com/gentoo/gentoo/pull/28355
+tc-ld-is-mold() {
+       local out
+
+       # Ensure ld output is in English.
+       local -x LC_ALL=C
+
+       # First check the linker directly.
+       out=$($(tc-getLD "$@") --version 2>&1)
+       if [[ ${out} == *"mold"* ]] ; then
+               return 0
+       fi
+
+       # Then see if they're selecting mold via compiler flags.
+       # Note: We're assuming they're using LDFLAGS to hold the
+       # options and not CFLAGS/CXXFLAGS.
+       local base="${T}/test-tc-linker"
+       cat <<-EOF > "${base}.c"
+       int main() { return 0; }
+       EOF
+       out=$($(tc-getCC "$@") ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wl,--version 
"${base}.c" -o "${base}" 2>&1)
+       rm -f "${base}"*
+       if [[ ${out} == *"mold"* ]] ; then
+               return 0
+       fi
+
+       # No mold here!
+       return 1
+}
+
+pkg_pretend() {
+       if use test ; then
+               CHECKREQS_DISK_BUILD="4000M"
+       else
+               CHECKREQS_DISK_BUILD="3600M"
+       fi
+
+       check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+       if [[ ${MERGE_TYPE} != binary ]] ; then
+               if use test ; then
+                       CHECKREQS_DISK_BUILD="4000M"
+               else
+                       CHECKREQS_DISK_BUILD="3600M"
+               fi
+
+               check-reqs_pkg_setup
+
+               llvm-r1_pkg_setup
+               rust_pkg_setup
+
+               if use clang && use lto && tc-ld-is-lld ; then
+                       local version_lld=$(ld.lld --version 2>/dev/null | awk 
'{ print $2 }')
+                       [[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 
"${version_lld}")
+                       [[ -z ${version_lld} ]] && die "Failed to read ld.lld 
version!"
+
+                       local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep 
-F -- 'LLVM version:' | awk '{ print $3 }')
+                       [[ -n ${version_llvm_rust} ]] && 
version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+                       [[ -z ${version_llvm_rust} ]] && die "Failed to read 
used LLVM version from rustc!"
+
+                       if ver_test "${version_lld}" -ne "${version_llvm_rust}" 
; then
+                               eerror "Rust is using LLVM version 
${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+                               eerror "You will be unable to link 
${CATEGORY}/${PN}. To proceed you have the following options:"
+                               eerror "  - Manually switch rust version using 
'eselect rust' to match used LLVM version"
+                               eerror "  - Switch to 
dev-lang/rust[system-llvm] which will guarantee matching version"
+                               eerror "  - Build ${CATEGORY}/${PN} without 
USE=lto"
+                               eerror "  - Rebuild lld with llvm that was used 
to build rust (may need to rebuild the whole "
+                               eerror "    llvm/clang/lld/rust chain depending 
on your @world updates)"
+                               die "LLVM version used by Rust 
(${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+                       fi
+               fi
+
+               python-any-r1_pkg_setup
+
+               # Build system is using /proc/self/oom_score_adj, bug #604394
+               addpredict /proc/self/oom_score_adj
+
+               if ! mountpoint -q /dev/shm ; then
+                       # If /dev/shm is not available, configure is known to 
fail with
+                       # a traceback report referencing 
/usr/lib/pythonN.N/multiprocessing/synchronize.py
+                       ewarn "/dev/shm is not mounted -- expect build 
failures!"
+               fi
+
+               # Ensure we use C locale when building, bug #746215
+               export LC_ALL=C
+       fi
+}
+
+src_prepare() {
+       pushd ../.. &>/dev/null || die
+
+       use lto && rm -v 
"${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+
+       if ! use ppc64; then
+               rm -v "${WORKDIR}"/firefox-patches/*ppc64*.patch || die
+       fi
+
+       # Workaround for bgo #915651,915651,929013 on musl
+       if use elibc_glibc ; then
+               rm -v 
"${WORKDIR}"/firefox-patches/*bgo-748849-RUST_TARGET_override.patch || die
+       fi
+
+       eapply "${WORKDIR}"/firefox-patches
+       eapply "${WORKDIR}"/spidermonkey-patches
+
+       default
+
+       # Make cargo respect MAKEOPTS
+       export CARGO_BUILD_JOBS="$(makeopts_jobs)"
+
+       # Workaround for bgo #915651,915651,929013 on musl
+       if ! use elibc_glibc ; then
+               if use amd64 ; then
+                       export RUST_TARGET="x86_64-unknown-linux-musl"
+               elif use x86 ; then
+                       export RUST_TARGET="i686-unknown-linux-musl"
+               else
+                       die "Unknown musl chost, please post your rustc -vV 
along with emerge --info on Gentoo's bug #915651"
+               fi
+       fi
+
+       # 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"
+
+       # use prefix shell in wrapper linker scripts, bug #789660
+       hprefixify "${S}"/../../build/cargo-{,host-}linker
+
+       einfo "Removing pre-built binaries ..."
+       find third_party -type f \( -name '*.so' -o -name '*.o' \) -print 
-delete || die
+
+       MOZJS_BUILDDIR="${WORKDIR}/build"
+       mkdir "${MOZJS_BUILDDIR}" || die
+
+       popd &>/dev/null || die
+}
+
+src_configure() {
+       # Show flags set at the beginning
+       einfo "Current CFLAGS:    ${CFLAGS}"
+       einfo "Current CXXFLAGS:  ${CXXFLAGS}"
+       einfo "Current LDFLAGS:   ${LDFLAGS}"
+       einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
+
+       local have_switched_compiler=
+       if use clang; then
+               # Force clang
+               einfo "Enforcing the use of clang due to USE=clang ..."
+
+               local version_clang=$(clang --version 2>/dev/null | grep -F -- 
'clang version' | awk '{ print $3 }')
+               [[ -n ${version_clang} ]] && version_clang=$(ver_cut 1 
"${version_clang}")
+               [[ -z ${version_clang} ]] && die "Failed to read clang version!"
+
+               if tc-is-gcc; then
+                       have_switched_compiler=yes
+               fi
+               AR=llvm-ar
+               CC=${CHOST}-clang-${version_clang}
+               CXX=${CHOST}-clang++-${version_clang}
+               NM=llvm-nm
+               RANLIB=llvm-ranlib
+
+       elif ! use clang && ! tc-is-gcc ; then
+               # Force gcc
+               have_switched_compiler=yes
+               einfo "Enforcing the use of gcc due to USE=-clang ..."
+               AR=gcc-ar
+               CC=${CHOST}-gcc
+               CXX=${CHOST}-g++
+               NM=gcc-nm
+               RANLIB=gcc-ranlib
+       fi
+
+       if [[ -n "${have_switched_compiler}" ]] ; then
+               # Because we switched active compiler we have to ensure
+               # that no unsupported flags are set
+               strip-unsupported-flags
+       fi
+
+       # Ensure we use correct toolchain,
+       # AS is used in a non-standard way by upstream, #bmo1654031
+       export HOST_CC="$(tc-getBUILD_CC)"
+       export HOST_CXX="$(tc-getBUILD_CXX)"
+       export AS="$(tc-getCC) -c"
+       tc-export CC CXX LD AR AS NM OBJDUMP RANLIB PKG_CONFIG
+
+       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-ctype
+               --disable-jemalloc
+               --disable-smoosh
+               --disable-strip
+
+               --enable-project=js
+               --enable-readline
+               --enable-release
+               --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)
+               $(use_enable test tests)
+       )
+
+       if use debug; then
+               myeconfargs+=( --disable-optimize )
+               myeconfargs+=( --enable-debug-symbols )
+               myeconfargs+=( --enable-real-time-tracing )
+       else
+               myeconfargs+=( --enable-optimize )
+               myeconfargs+=( --disable-debug-symbols )
+               myeconfargs+=( --disable-real-time-tracing )
+       fi
+
+       # We always end up disabling this at some point due to newer rust 
versions. bgo#933372
+       myeconfargs+=( --disable-rust-simd )
+
+       # 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
+
+       # Tell build system that we want to use LTO
+       if use lto ; then
+               if use clang ; then
+                       if tc-ld-is-mold ; then
+                               myeconfargs+=( --enable-linker=mold )
+                       else
+                               myeconfargs+=( --enable-linker=lld )
+                       fi
+                       myeconfargs+=( --enable-lto=cross )
+
+               else
+                       myeconfargs+=( --enable-linker=bfd )
+                       myeconfargs+=( --enable-lto=full )
+               fi
+       fi
+
+       # LTO flag was handled via configure
+       filter-lto
+
+       # Use system's Python environment
+       export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
+       export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
+
+       # Show flags we will use
+       einfo "Build CFLAGS:    ${CFLAGS}"
+       einfo "Build CXXFLAGS:  ${CXXFLAGS}"
+       einfo "Build LDFLAGS:   ${LDFLAGS}"
+       einfo "Build RUSTFLAGS: ${RUSTFLAGS}"
+
+       # 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"
+}
+
+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
+
+       cp "${FILESDIR}"/spidermonkey-${SLOT}-known-test-failures.txt 
"${T}"/known_failures.list || die
+
+       if use sparc ; then
+               echo "non262/Array/regress-157652.js" >> 
"${T}"/known_failures.list
+               echo "non262/regress/regress-422348.js" >> 
"${T}"/known_failures.list
+               echo 
"test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js"
 >> "${T}"/known_failures.list
+       fi
+
+       if use x86 ; then
+               echo "non262/Date/timeclip.js" >> "${T}"/known_failures.list
+               echo "test262/built-ins/Date/UTC/fp-evaluation-order.js" >> 
"${T}"/known_failures.list
+               echo "test262/language/types/number/S8.5_A2.1.js" >> 
"${T}"/known_failures.list
+               echo "test262/language/types/number/S8.5_A2.2.js" >> 
"${T}"/known_failures.list
+       fi
+
+       ${EPYTHON} \
+               "${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
+               ${EPYTHON} \
+                       "${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
+}

Reply via email to