From 132b684cfbf3df6307c55329f18096b3e77f4464 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Sat, 4 Apr 2020 12:41:44 +0200 Subject: dev-lang/spidermonkey: bump to v68.6.1 Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann --- dev-lang/spidermonkey/Manifest | 2 +- dev-lang/spidermonkey/spidermonkey-68.6.0.ebuild | 222 ----------------------- dev-lang/spidermonkey/spidermonkey-68.6.1.ebuild | 222 +++++++++++++++++++++++ 3 files changed, 223 insertions(+), 223 deletions(-) delete mode 100644 dev-lang/spidermonkey/spidermonkey-68.6.0.ebuild create mode 100644 dev-lang/spidermonkey/spidermonkey-68.6.1.ebuild (limited to 'dev-lang') diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest index 76424401759c..be4f533668a9 100644 --- a/dev-lang/spidermonkey/Manifest +++ b/dev-lang/spidermonkey/Manifest @@ -1,5 +1,5 @@ DIST firefox-68.0-patches-12.tar.xz 17476 BLAKE2B bd788e24820f902f4ca908b0cf7a49a4c57e058915af1eb87233d19d91271092676c1ee4c67e88df2411ecccea47c4e735efdf95945954f2d9aac5cc2f9051f2 SHA512 8033a3c445eaddd28188b338534da16a4130b679a5f6673b3094524e47435890e6d454d7b67f81bbe21f80ef1b65fa7e6c27d71191ba70dd8ea87fc68463f9a7 -DIST firefox-68.6.0esr.source.tar.xz 313814396 BLAKE2B 54fd94d629a7c70060b7c3c130c2de780ee270a76654f4fd1500a05a7412220e0db9a1fca845565279b347da769e7dbe0bc98a5a2e110fc26e276115fe1e37b7 SHA512 84565d654ed8bd2d036d08de4d16e41ae8881f0b20b34424ab347d50a37384acf50c04f74269720e79db28028569dff79f2b910848939ff87c078f36684a75a3 +DIST firefox-68.6.1esr.source.tar.xz 319034884 BLAKE2B 1f28135372b48d28327d332cc4a976d9d3f1f64afbe1ece5e9ba4428b032d0677f68ec41efc722cd274a1e134e4b1ca5dc0817311664f8ea544cd37153785dd3 SHA512 9a3a938021989d99d1c7ca6ca166d6e55a82f70f28e8b12c24b1894d72c23ed13a3e84c17ab2ea55091690775d11613d48595c64de2450e5daa43d28b341f17a DIST js-1.7.0.tar.gz 1165607 BLAKE2B 61749e10886bbb9e4958a41925fae8dcbd7d943b9bf838878368c30e26ba61f300bc2ec37982653b87fedf76707dda2ffd510282de4bce87d1da11ca42fa108c SHA512 9d9fbd9c1dae969ca19ddb0f977ac56f3e0479ec393b859de252fcdd8b7fc325e80399073540884ed365ce56a3219be34c0db9300d5e50f32969660c90527e51 DIST js185-1.0.0.tar.gz 6164605 BLAKE2B 76a37f0ceae05d3475853875bd0ce4be6e525e4114816f8f281ea6fc6b60a71060975a0fa1cb843f57ad1e2f842dfb26b24244fa0fd6c20f6ae2ebbe430f70be SHA512 2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718 DIST mozjs-38.3.0sfink2.tar.bz2 27232902 BLAKE2B 42a039a41b7479a32e22f260cb58f098e1a1d4833f801f193bdd8b75403f94567b9ef2ebe85b2a811fe2f9b27cd934afe1054bd4e7d9aae0b8a80acdec8e42a4 SHA512 debad1fbd21e025c567b083677cfd0a2023ec2aff750241f495ac2977034a7299e068cb3b0b2351c97457119cc8aef563f00416092a70a3a269d20947b700206 diff --git a/dev-lang/spidermonkey/spidermonkey-68.6.0.ebuild b/dev-lang/spidermonkey/spidermonkey-68.6.0.ebuild deleted file mode 100644 index 27c1b4f3fb2b..000000000000 --- a/dev-lang/spidermonkey/spidermonkey-68.6.0.ebuild +++ /dev/null @@ -1,222 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{6..8} ) - -WANT_AUTOCONF="2.1" - -inherit autotools check-reqs python-any-r1 - -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-12" -SPIDERMONKEY_PATCHSET="${PN}-68.6.0-patches-03" - -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" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" - -SLOT="68" -LICENSE="MPL-2.0" -IUSE="debug +jit test" - -RESTRICT="!test? ( test )" - -BDEPEND="dev-lang/python:2.7 - test? ( ${PYTHON_DEPS} )" - -DEPEND=">=dev-libs/icu-63.1:= - >=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 - eapply "${WORKDIR}"/firefox - eapply "${WORKDIR}"/spidermonkey-patches - - default - - 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" - - # forcing system-icu allows us to skip patching bundled ICU for PPC - # and other minor arches - ECONF_SOURCE="${S}" \ - econf \ - --disable-jemalloc \ - --disable-optimize \ - --disable-strip \ - --enable-readline \ - --enable-shared-js \ - --with-intl-api \ - --with-system-icu \ - --with-system-nspr \ - --with-system-zlib \ - $(use_enable debug) \ - $(use_enable jit ion) \ - $(use_enable test tests) \ - 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/intl402/RelativeTimeFormat/prototype/format/en-us-numeric-auto.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 ) - - 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 -} diff --git a/dev-lang/spidermonkey/spidermonkey-68.6.1.ebuild b/dev-lang/spidermonkey/spidermonkey-68.6.1.ebuild new file mode 100644 index 000000000000..27c1b4f3fb2b --- /dev/null +++ b/dev-lang/spidermonkey/spidermonkey-68.6.1.ebuild @@ -0,0 +1,222 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{6..8} ) + +WANT_AUTOCONF="2.1" + +inherit autotools check-reqs python-any-r1 + +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-12" +SPIDERMONKEY_PATCHSET="${PN}-68.6.0-patches-03" + +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" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" + +SLOT="68" +LICENSE="MPL-2.0" +IUSE="debug +jit test" + +RESTRICT="!test? ( test )" + +BDEPEND="dev-lang/python:2.7 + test? ( ${PYTHON_DEPS} )" + +DEPEND=">=dev-libs/icu-63.1:= + >=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 + eapply "${WORKDIR}"/firefox + eapply "${WORKDIR}"/spidermonkey-patches + + default + + 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" + + # forcing system-icu allows us to skip patching bundled ICU for PPC + # and other minor arches + ECONF_SOURCE="${S}" \ + econf \ + --disable-jemalloc \ + --disable-optimize \ + --disable-strip \ + --enable-readline \ + --enable-shared-js \ + --with-intl-api \ + --with-system-icu \ + --with-system-nspr \ + --with-system-zlib \ + $(use_enable debug) \ + $(use_enable jit ion) \ + $(use_enable test tests) \ + 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/intl402/RelativeTimeFormat/prototype/format/en-us-numeric-auto.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 ) + + 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 +} -- cgit v1.2.3-65-gdbad