commit:     027e4ed03ad445c2c09d565dd0689e391f430897
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 19 08:30:20 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 08:32:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=027e4ed0

dev-lang/spidermonkey: bump to v78.10.0

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 dev-lang/spidermonkey/Manifest                    |   1 +
 dev-lang/spidermonkey/spidermonkey-78.10.0.ebuild | 446 ++++++++++++++++++++++
 2 files changed, 447 insertions(+)

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 87af97def65..2c605a415b2 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,5 +1,6 @@
 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.10.0esr.source.tar.xz 334642452 BLAKE2B 
a57e39e5f8d5bab08359957017bb44369598b49987b561176bcbb88b0bc10cd05214fd084faed872f4006e90e1b84a2f9b6f46049da763ef554d235c00d07519
 SHA512 
5e2cf137dc781855542c29df6152fa74ba749801640ade3cf01487ce993786b87a4f603d25c0af9323e67c7e15c75655523428c1c1426527b8623c7ded9f5946
 DIST firefox-78.6.0esr.source.tar.xz 338098664 BLAKE2B 
9d082b6104bffbd0d918dc1adf2a01ac32613d8048faf399177834c4949714a00c1f4383b778a21d6b6684296d8f9bd44fa547ee2507a8631d206e3764d2ceeb
 SHA512 
a1e2d6af0020784d00ed3cb4d778c136685e7c2f6ae536cc270fbd331d51d483d17dff9acd7ad8e6b3b231b9df894c146092889357b23715814a080c6f08d11a
 DIST firefox-78.7.1esr.source.tar.xz 334417504 BLAKE2B 
c0c90488ef9727363f03707c3d1e83ab5965a32775db9e6832883b94f265a3d95bb468648360fa3f016c34044f4c706db84125f7c5b545aaa1dedcf03196cb0c
 SHA512 
d5828667ab07f5971049092102b7017472a835a3ab8581ba485a528e9b269aafdeeebecb4c882043459c2b901290c5525d795b04c1d4f30f7b74ee6cd7b18646
 DIST firefox-78.8.0esr.source.tar.xz 330937116 BLAKE2B 
dc2476e8bad026589e8889abf3c38b7a7283efefce99dedd8bfb73bdbcdf66c7480d388e9c3ffc28177abb9c4f78cc2c9f6049e7fcb0a161871a99bcc25fa8ea
 SHA512 
0160aa6c408c2af66d24b74cf98e1a07ab1604e7b93ffcde79201f9d68e41e896ef965f1904de52d5dd82ffedae33ac96e93b871727bf5dd5983c5af2f1f439f

diff --git a/dev-lang/spidermonkey/spidermonkey-78.10.0.ebuild 
b/dev-lang/spidermonkey/spidermonkey-78.10.0.ebuild
new file mode 100644
index 00000000000..aaf36498e40
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-78.10.0.ebuild
@@ -0,0 +1,446 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+# Patch version
+FIREFOX_PATCHSET="firefox-78esr-patches-10.tar.xz"
+SPIDERMONKEY_PATCHSET="spidermonkey-78-patches-03.tar.xz"
+
+LLVM_MAX_SLOT=12
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+WANT_AUTOCONF="2.1"
+
+inherit autotools check-reqs flag-o-matic llvm multiprocessing python-any-r1 
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/~{whissi,polynomial-c,axs}/mozilla/patchsets/${FIREFOX_PATCHSET}
+       
https://dev.gentoo.org/~{whissi,polynomial-c,axs}/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://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey";
+
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~s390 ~x86"
+
+SLOT="78"
+LICENSE="MPL-2.0"
+IUSE="clang cpu_flags_arm_neon debug +jit lto test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+       >=virtual/rust-1.41.0
+       virtual/pkgconfig
+       || (
+               (
+                       sys-devel/llvm:12
+                       clang? (
+                               sys-devel/clang:12
+                               lto? ( =sys-devel/lld-12* )
+                       )
+               )
+               (
+                       sys-devel/llvm:11
+                       clang? (
+                               sys-devel/clang:11
+                               lto? ( =sys-devel/lld-11* )
+                       )
+               )
+               (
+                       sys-devel/llvm:10
+                       clang? (
+                               sys-devel/clang:10
+                               lto? ( =sys-devel/lld-10* )
+                       )
+               )
+       )
+       lto? (
+               !clang? ( sys-devel/binutils[gold] )
+       )"
+
+CDEPEND=">=dev-libs/icu-67.1:=
+       >=dev-libs/nspr-4.25
+       sys-libs/readline:0=
+       >=sys-libs/zlib-1.2.3"
+
+DEPEND="${CDEPEND}
+       test? (
+               $(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
+       )"
+
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/firefox-${MY_PV}/js/src"
+
+llvm_check_deps() {
+       if use clang ; then
+               if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+                       ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot 
use LLVM slot ${LLVM_SLOT} ..." >&2
+                       return 1
+               fi
+
+               if use lto ; then
+                       if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; 
then
+                               ewarn "=sys-devel/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
+               has_version "dev-python/six[${PYTHON_USEDEP}]"
+       fi
+}
+
+pkg_pretend() {
+       if use test ; then
+               CHECKREQS_DISK_BUILD="7600M"
+       else
+               CHECKREQS_DISK_BUILD="6400M"
+       fi
+
+       check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+       if [[ ${MERGE_TYPE} != binary ]] ; then
+               if use test ; then
+                       CHECKREQS_DISK_BUILD="7600M"
+               else
+                       CHECKREQS_DISK_BUILD="6400M"
+               fi
+
+               check-reqs_pkg_setup
+
+               llvm_pkg_setup
+
+               if use clang && use lto ; 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!"
+
+                       # temp fix for https://bugs.gentoo.org/768543
+                       # we can assume that rust 1.{49,50}.0 always uses llvm 
11
+                       local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 
'release:' | awk '{ print $2 }')
+                       [[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 
"${version_rust}")
+                       [[ -z ${version_rust} ]] && die "Failed to read version 
from rustc!"
+
+                       if ver_test "${version_rust}" -ge "1.49" && ver_test 
"${version_rust}" -le "1.50" ; then
+                               local version_llvm_rust="11"
+                       else
+                               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!"
+                       fi
+
+                       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"
+                               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
+
+       eapply "${WORKDIR}"/firefox-patches
+       eapply "${WORKDIR}"/spidermonkey-patches
+
+       default
+
+       # Make LTO respect MAKEOPTS
+       sed -i \
+               -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+               build/moz.configure/lto-pgo.configure \
+               || die "sed failed to set num_cores"
+
+       # 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"
+
+       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
+       eautoconf
+}
+
+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 && ! tc-is-clang ; then
+               # Force clang
+               einfo "Enforcing the use of clang due to USE=clang ..."
+               have_switched_compiler=yes
+               AR=llvm-ar
+               CC=${CHOST}-clang
+               CXX=${CHOST}-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
+       export HOST_CC="$(tc-getBUILD_CC)"
+       export HOST_CXX="$(tc-getBUILD_CXX)"
+       tc-export CC CXX LD AR 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-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)
+               $(use_enable test tests)
+       )
+
+       if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+               myeconfargs+=( --enable-rust-simd )
+       fi
+
+       # 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
+               myeconfargs+=( --enable-lto )
+
+               if use clang ; then
+                       myeconfargs+=( --enable-linker=lld )
+               else
+                       myeconfargs+=( --enable-linker=gold )
+               fi
+       fi
+
+       # LTO flag was handled via configure
+       filter-flags '-flto*'
+
+       if tc-is-gcc ; then
+               if ver_test $(gcc-fullversion) -ge 10 ; then
+                       einfo "Forcing -fno-tree-loop-vectorize to workaround 
GCC bug, see bug 758446 ..."
+                       append-cxxflags -fno-tree-loop-vectorize
+               fi
+       fi
+
+       # 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
+
+       local -a KNOWN_TESTFAILURES
+       KNOWN_TESTFAILURES+=( non262/Date/reset-time-zone-cache-same-offset.js )
+       KNOWN_TESTFAILURES+=( non262/Date/time-zone-path.js )
+       KNOWN_TESTFAILURES+=( non262/Date/time-zones-historic.js )
+       KNOWN_TESTFAILURES+=( non262/Date/time-zones-imported.js )
+       KNOWN_TESTFAILURES+=( non262/Date/toString-localized.js )
+       KNOWN_TESTFAILURES+=( non262/Date/toString-localized-posix.js )
+       KNOWN_TESTFAILURES+=( non262/Intl/Date/toLocaleString_timeZone.js )
+       KNOWN_TESTFAILURES+=( non262/Intl/Date/toLocaleDateString_timeZone.js )
+       KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/format.js )
+       KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/format_timeZone.js )
+       KNOWN_TESTFAILURES+=( 
non262/Intl/DateTimeFormat/timeZone_backward_links.js )
+       KNOWN_TESTFAILURES+=( 
non262/Intl/DateTimeFormat/tz-environment-variable.js )
+       KNOWN_TESTFAILURES+=( non262/Intl/DisplayNames/language.js )
+       KNOWN_TESTFAILURES+=( non262/Intl/DisplayNames/region.js )
+       KNOWN_TESTFAILURES+=( non262/Intl/Locale/likely-subtags.js )
+       KNOWN_TESTFAILURES+=( non262/Intl/Locale/likely-subtags-generated.js )
+       KNOWN_TESTFAILURES+=( 
test262/intl402/Locale/prototype/minimize/removing-likely-subtags-first-adds-likely-subtags.js
 )
+
+       if use x86 ; then
+               KNOWN_TESTFAILURES+=( non262/Date/timeclip.js )
+               KNOWN_TESTFAILURES+=( 
test262/built-ins/Number/prototype/toPrecision/return-values.js )
+               KNOWN_TESTFAILURES+=( 
test262/language/types/number/S8.5_A2.1.js )
+               KNOWN_TESTFAILURES+=( 
test262/language/types/number/S8.5_A2.2.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
+}

Reply via email to