From 4465a40b43fed7169f8d296a0e21ebb20adfee42 Mon Sep 17 00:00:00 2001 From: Jory Pratt Date: Tue, 30 Apr 2019 13:43:20 -0500 Subject: dev-lang/spidermonkey: Fix BE, force /bin/bash for shell Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Jory Pratt --- dev-lang/spidermonkey/Manifest | 2 +- .../spidermonkey/spidermonkey-60.5.2_p0-r1.ebuild | 149 --------------------- .../spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild | 149 +++++++++++++++++++++ 3 files changed, 150 insertions(+), 150 deletions(-) delete mode 100644 dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r1.ebuild create mode 100644 dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest index 68618c2c36c5..4822a0394ec2 100644 --- a/dev-lang/spidermonkey/Manifest +++ b/dev-lang/spidermonkey/Manifest @@ -7,7 +7,7 @@ DIST mozjs-52.9.1pre1.tar.bz2 30178574 BLAKE2B 0920432b5140e78297a9bcbccb54268d7 DIST mozjs-60.5.2.tar.bz2 32816585 BLAKE2B 45ac4c9646e1275faf60eeedbf486f802cd106583eb7f640fe2243adc7cbb811dced5cefa94426cceca63468b0112be84078ffcef24cb2b8c1a7b6c8173c0d45 SHA512 5fb73330e7803bdd524fbe7cfdf4e6b72e85d4b22b0c827400317b5d052d1088d36e558ceac376393089e9d03e658b24e69262851fc04a66bbcda47135423dc0 DIST mozjs17.0.0.tar.gz 6778934 BLAKE2B a37debf5079fc4c27bb9edd3172c6e7914f6128fac6ffa97b49ac266c477d0916b180fb68ecd0916a52f935959a83d73254b0ba72b4898adc5e3b85927d17d2a SHA512 39b68aeb9f712f146778d8b68ee795709a1372c8ab893a222af4eb34882427d6f5cf877e743d6cb2f1b4348c194d8f3774f00cb775b03515b34b49560b748be4 DIST spidermonkey-52.0-patches-0.tar.xz 5172 BLAKE2B 8bcf9477de47ef3b882cd3281efa7f77c16ce11fc93f44446a620917adf629fde8290af1dd69f0930a889aacfee3603bf60eb9c1e718a1dfd3e218a1013b6192 SHA512 88ad640fb0efa4972f1b7782bd0abee1751b73914ee51faade93b25c4d8eec64e7693898842a406c49fc2ab43733404efeccb138afb64d2193b9a5eb612578e3 -DIST spidermonkey-60.0-patches-03.tar.xz 3024 BLAKE2B b023794c0f7d4d0c0c7549947793e1b33c8302de90dc1aa9a9661c721241943669840ddaf28e24b59bebd87fffae3af7749f54f93ae4b2c987cd6da63ffe16ba SHA512 1c985bba53709fffbfba5720143f302d1863ba6b14fc90067e6b31a3c9889b3f5e0c379baab43402a39106d1ee1a05798e085ce76f082e7d17b01acba6e020e5 +DIST spidermonkey-60.0-patches-04.tar.xz 4428 BLAKE2B af78049cd9b3ee6a9b689e6253486c4670fd3b506faade7d745dafaa7af329c0bd15cd35e95528a4c96688230f4803130967fb09b97aae2bda0ce0f73acaaf3e SHA512 fb1326a81512146ba98773d4f7e0c4bc1bff0f076897c13f576fcf63b56f6965efeff633eea9160bca9f9bc4546505901084eabc33bc955de0b7ab3d6334387a DIST spidermonkey-slot0-patches-01.tar.xz 10488 BLAKE2B 4a5195ac11d1076046424fc10d1416d097fb230cd8b0b28ac8b65d379e0c0518586ced0f48f833dea52b13fb5d300e02664657ab2479bfcc343bc358d394d5d7 SHA512 6c878ed0b50c052989a8b965fed845e9c672b691f4c4b1f98ee82e81a33880e1e6bf1dac8222d71322553282de602a88272dedebbcf50d27967fc172f0a8054a DIST spidermonkey-slot0-patches-02.tar.xz 10952 BLAKE2B fb7bf5cdac6c821a48d407ff172fe0ec7297e047d3b3bab952f226f413b83ea70325175b41c1680725ff588111b424efc97a0c66e392989da510c43d38528ff1 SHA512 cd62890c4b58658d99fc1b52f05ccb35c07da835b168bb9d5e6b219de5021122c199cc2255c5b0be01ef582f53dd51c9975921e6bde9f14e9b43536e2bee85f2 DIST spidermonkey-slot17-patches-01.tar.xz 2748 BLAKE2B a55504d726f925096de7e066a1d323154bc796018644f347bc1d012ea6ee8441cc19f30689e06fd26bab5a5d2e8376e90bf2c1930a588be8b48865f7bbc524ea SHA512 21a90f85d156de3cca9811317507162a458f908bb447924fcfbf49b7bb70496b611ce7df90b90775316b8ceafda56692be3bf856b168b83ed40b8a5c668eed3f diff --git a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r1.ebuild deleted file mode 100644 index 1cf651bf5db7..000000000000 --- a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r1.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -WANT_AUTOCONF="2.1" -inherit autotools check-reqs toolchain-funcs pax-utils mozcoreconf-v5 - -MY_PN="mozjs" -MY_P="${MY_PN}-${PV/_rc/.rc}" -MY_P="${MY_P/_pre/pre}" -MY_P="${MY_P%_p[0-9]*}" -DESCRIPTION="Stand-alone JavaScript C++ library" -HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" -#SRC_URI="https://archive.mozilla.org/pub/spidermonkey/prereleases/60/pre3/${MY_P}.tar.bz2 -SRC_URI="https://dev.gentoo.org/~axs/distfiles/${MY_P}.tar.bz2 - https://dev.gentoo.org/~axs/distfiles/${PN}-60.0-patches-03.tar.xz" - -LICENSE="NPL-1.1" -SLOT="60" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="debug +jit minimal +system-icu test" - -RESTRICT="ia64? ( test )" - -S="${WORKDIR}/${MY_P%.rc*}" - -BUILDDIR="${S}/jsobj" - -RDEPEND=">=dev-libs/nspr-4.13.1 - virtual/libffi - sys-libs/readline:0= - >=sys-libs/zlib-1.2.3:= - system-icu? ( >=dev-libs/icu-59.1:= )" -DEPEND="${RDEPEND}" - -pkg_pretend() { - CHECKREQS_DISK_BUILD="2G" - - check-reqs_pkg_setup -} -pkg_setup(){ - [[ ${MERGE_TYPE} == "binary" ]] || \ - moz_pkgsetup -} - -src_prepare() { - eapply "${WORKDIR}/${PN}" - - eapply_user - - if [[ ${CHOST} == *-freebsd* ]]; then - # Don't try to be smart, this does not work in cross-compile anyway - ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk" || die - fi - - cd "${S}/js/src" || die - eautoconf old-configure.in - eautoconf - - # there is a default config.cache that messes everything up - rm -f "${S}/js/src"/config.cache || die - - mkdir -p "${BUILDDIR}" || die -} - -src_configure() { - cd "${BUILDDIR}" || die - - ECONF_SOURCE="${S}/js/src" \ - econf \ - --disable-jemalloc \ - --enable-readline \ - --with-system-nspr \ - --with-system-zlib \ - --disable-optimize \ - --with-intl-api \ - $(use_with system-icu) \ - $(use_enable debug) \ - $(use_enable jit ion) \ - $(use_enable test tests) \ - XARGS="/usr/bin/xargs" \ - CONFIG_SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ - CC="${CC}" CXX="${CXX}" LD="${LD}" AR="${AR}" RANLIB="${RANLIB}" -} - -cross_make() { - emake \ - CFLAGS="${BUILD_CFLAGS}" \ - CXXFLAGS="${BUILD_CXXFLAGS}" \ - AR="${BUILD_AR}" \ - CC="${BUILD_CC}" \ - CXX="${BUILD_CXX}" \ - RANLIB="${BUILD_RANLIB}" \ - "$@" -} -src_compile() { - cd "${BUILDDIR}" || die - if tc-is-cross-compiler; then - tc-export_build_env BUILD_{AR,CC,CXX,RANLIB} - cross_make \ - MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" \ - HOST_OPTIMIZE_FLAGS="" MODULE_OPTIMIZE_FLAGS="" \ - MOZ_PGO_OPTIMIZE_FLAGS="" \ - host_jsoplengen host_jskwgen - cross_make \ - MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" HOST_OPTIMIZE_FLAGS="" \ - -C config nsinstall - mv {,native-}host_jskwgen || die - mv {,native-}host_jsoplengen || die - mv config/{,native-}nsinstall || die - sed -i \ - -e 's@./host_jskwgen@./native-host_jskwgen@' \ - -e 's@./host_jsoplengen@./native-host_jsoplengen@' \ - Makefile || die - sed -i -e 's@/nsinstall@/native-nsinstall@' config/config.mk || die - rm -f config/host_nsinstall.o \ - config/host_pathsub.o \ - host_jskwgen.o \ - host_jsoplengen.o || die - fi - - MOZ_MAKE_FLAGS="${MAKEOPTS}" \ - emake \ - MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" \ - HOST_OPTIMIZE_FLAGS="" MODULE_OPTIMIZE_FLAGS="" \ - MOZ_PGO_OPTIMIZE_FLAGS="" -} - -src_test() { - cd "${BUILDDIR}/js/src/jsapi-tests" || die - ./jsapi-tests || die -} - -src_install() { - cd "${BUILDDIR}" || die - emake DESTDIR="${D}" install - - if ! use minimal; then - if use jit; then - pax-mark m "${ED}"usr/bin/js${SLOT} - fi - else - rm -f "${ED}"usr/bin/js${SLOT} - fi - - # We can't actually disable building of static libraries - # They're used by the tests and in a few other places - find "${D}" -iname '*.a' -o -iname '*.ajs' -delete || die -} diff --git a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild new file mode 100644 index 000000000000..08ff0dac73e5 --- /dev/null +++ b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +WANT_AUTOCONF="2.1" +inherit autotools check-reqs toolchain-funcs pax-utils mozcoreconf-v5 + +MY_PN="mozjs" +MY_P="${MY_PN}-${PV/_rc/.rc}" +MY_P="${MY_P/_pre/pre}" +MY_P="${MY_P%_p[0-9]*}" +DESCRIPTION="Stand-alone JavaScript C++ library" +HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" +#SRC_URI="https://archive.mozilla.org/pub/spidermonkey/prereleases/60/pre3/${MY_P}.tar.bz2 +SRC_URI="https://dev.gentoo.org/~axs/distfiles/${MY_P}.tar.bz2 + https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PN}-60.0-patches-04.tar.xz" + +LICENSE="NPL-1.1" +SLOT="60" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="debug +jit minimal +system-icu test" + +RESTRICT="ia64? ( test )" + +S="${WORKDIR}/${MY_P%.rc*}" + +BUILDDIR="${S}/jsobj" + +RDEPEND=">=dev-libs/nspr-4.13.1 + virtual/libffi + sys-libs/readline:0= + >=sys-libs/zlib-1.2.3:= + system-icu? ( >=dev-libs/icu-59.1:= )" +DEPEND="${RDEPEND}" + +pkg_pretend() { + CHECKREQS_DISK_BUILD="2G" + + check-reqs_pkg_setup +} +pkg_setup(){ + [[ ${MERGE_TYPE} == "binary" ]] || \ + moz_pkgsetup +} + +src_prepare() { + eapply "${WORKDIR}/${PN}" + + eapply_user + + if [[ ${CHOST} == *-freebsd* ]]; then + # Don't try to be smart, this does not work in cross-compile anyway + ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk" || die + fi + + cd "${S}/js/src" || die + eautoconf old-configure.in + eautoconf + + # there is a default config.cache that messes everything up + rm -f "${S}/js/src"/config.cache || die + + mkdir -p "${BUILDDIR}" || die +} + +src_configure() { + cd "${BUILDDIR}" || die + + ECONF_SOURCE="${S}/js/src" \ + econf \ + --disable-jemalloc \ + --enable-readline \ + --with-system-nspr \ + --with-system-zlib \ + --disable-optimize \ + --with-intl-api \ + $(use_with system-icu) \ + $(use_enable debug) \ + $(use_enable jit ion) \ + $(use_enable test tests) \ + XARGS="/usr/bin/xargs" \ + CONFIG_SHELL="${EPREFIX}/bin/bash" \ + CC="${CC}" CXX="${CXX}" LD="${LD}" AR="${AR}" RANLIB="${RANLIB}" +} + +cross_make() { + emake \ + CFLAGS="${BUILD_CFLAGS}" \ + CXXFLAGS="${BUILD_CXXFLAGS}" \ + AR="${BUILD_AR}" \ + CC="${BUILD_CC}" \ + CXX="${BUILD_CXX}" \ + RANLIB="${BUILD_RANLIB}" \ + "$@" +} +src_compile() { + cd "${BUILDDIR}" || die + if tc-is-cross-compiler; then + tc-export_build_env BUILD_{AR,CC,CXX,RANLIB} + cross_make \ + MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" \ + HOST_OPTIMIZE_FLAGS="" MODULE_OPTIMIZE_FLAGS="" \ + MOZ_PGO_OPTIMIZE_FLAGS="" \ + host_jsoplengen host_jskwgen + cross_make \ + MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" HOST_OPTIMIZE_FLAGS="" \ + -C config nsinstall + mv {,native-}host_jskwgen || die + mv {,native-}host_jsoplengen || die + mv config/{,native-}nsinstall || die + sed -i \ + -e 's@./host_jskwgen@./native-host_jskwgen@' \ + -e 's@./host_jsoplengen@./native-host_jsoplengen@' \ + Makefile || die + sed -i -e 's@/nsinstall@/native-nsinstall@' config/config.mk || die + rm -f config/host_nsinstall.o \ + config/host_pathsub.o \ + host_jskwgen.o \ + host_jsoplengen.o || die + fi + + MOZ_MAKE_FLAGS="${MAKEOPTS}" \ + emake \ + MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" \ + HOST_OPTIMIZE_FLAGS="" MODULE_OPTIMIZE_FLAGS="" \ + MOZ_PGO_OPTIMIZE_FLAGS="" +} + +src_test() { + cd "${BUILDDIR}/js/src/jsapi-tests" || die + ./jsapi-tests || die +} + +src_install() { + cd "${BUILDDIR}" || die + emake DESTDIR="${D}" install + + if ! use minimal; then + if use jit; then + pax-mark m "${ED}"usr/bin/js${SLOT} + fi + else + rm -f "${ED}"usr/bin/js${SLOT} + fi + + # We can't actually disable building of static libraries + # They're used by the tests and in a few other places + find "${D}" -iname '*.a' -o -iname '*.ajs' -delete || die +} -- cgit v1.2.3-65-gdbad