diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2020-04-01 17:45:07 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-04-01 17:52:06 +0200 |
| commit | 4d1ed85e36abf97f6efc5551d738eae170446637 (patch) | |
| tree | d7b70e901f01d90c3a1c0059f45347b9e16e0b4c /dev-lang | |
| parent | net-wireless/iwd: check for RFKILL (diff) | |
| download | gentoo-4d1ed85e36abf97f6efc5551d738eae170446637.tar.gz gentoo-4d1ed85e36abf97f6efc5551d738eae170446637.tar.bz2 gentoo-4d1ed85e36abf97f6efc5551d738eae170446637.zip | |
dev-lang/spidermonkey: rev bump
- Remove deps on LLVM/Rust
- Always require system-icu so we don't have fix bundled ICU
- Fix LICENSE, spidermonkey is MPL-2.0 only.
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/spidermonkey/Manifest | 2 | ||||
| -rw-r--r-- | dev-lang/spidermonkey/spidermonkey-68.6.0_pre1.ebuild (renamed from dev-lang/spidermonkey/spidermonkey-68.6.0_pre.ebuild) | 26 |
2 files changed, 17 insertions, 11 deletions
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest index 34e48ce82966..fadbe31a7574 100644 --- a/dev-lang/spidermonkey/Manifest +++ b/dev-lang/spidermonkey/Manifest @@ -9,7 +9,7 @@ DIST mozjs-60.5.2.tar.bz2 32816585 BLAKE2B 45ac4c9646e1275faf60eeedbf486f802cd10 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-04.tar.xz 4428 BLAKE2B af78049cd9b3ee6a9b689e6253486c4670fd3b506faade7d745dafaa7af329c0bd15cd35e95528a4c96688230f4803130967fb09b97aae2bda0ce0f73acaaf3e SHA512 fb1326a81512146ba98773d4f7e0c4bc1bff0f076897c13f576fcf63b56f6965efeff633eea9160bca9f9bc4546505901084eabc33bc955de0b7ab3d6334387a -DIST spidermonkey-68.6.0-patches-01.tar.xz 3896 BLAKE2B 183de4fa88fdbad992dd8d7c0df98d456517f6c620a5c7a7873eb18f8d3fe2907f7501033d36e500b05c187604c36f11ea85ec9f2a720205cbba79148ba37d0f SHA512 95b9012a8f6371dc8dae5dc176661bc85555cf9f2d81740705f85b1109ea45b173c7d29078d0e87908a9905ccd872a0c9e619a32a63a071845df3b1dd2e63b69 +DIST spidermonkey-68.6.0-patches-02.tar.xz 4232 BLAKE2B 1a8573b38ba2878214d8377ec7a98ecee7b6cbb014296a7e9bcdd24f660b8f5397de1a069ca302e87cf88f5f6033005c62dc229082ae4a072fec07d9a8a3c312 SHA512 b61370b9f488abe1941ba946e199a1b667a09717a8125373a83480e92c6371881369c216099c23cfe8a0a81e4180af1997e1ae78b7e269e808a4c2eb9acde2ac 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-68.6.0_pre.ebuild b/dev-lang/spidermonkey/spidermonkey-68.6.0_pre1.ebuild index 8f84dca63a5a..ed7f8cf6a4de 100644 --- a/dev-lang/spidermonkey/spidermonkey-68.6.0_pre.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-68.6.0_pre1.ebuild @@ -28,7 +28,7 @@ fi # Patch version FIREFOX_PATCHSET="firefox-68.0-patches-12" -SPIDERMONKEY_PATCHSET="${PN}-68.6.0-patches-01" +SPIDERMONKEY_PATCHSET="${PN}-68.6.0-patches-02" 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" @@ -52,18 +52,18 @@ HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey KEYWORDS="" SLOT="68" -LICENSE="MPL-2.0 GPL-2 LGPL-2.1" -IUSE="debug +jit +system-icu test" +LICENSE="MPL-2.0" +IUSE="debug +jit test" RESTRICT="!test? ( test )" BDEPEND="dev-lang/python:2.7 test? ( ${PYTHON_DEPS} )" -DEPEND=">=dev-libs/nspr-4.21 +DEPEND=">=dev-libs/icu-63.1:= + >=dev-libs/nspr-4.21 sys-libs/readline:0= - >=sys-libs/zlib-1.2.3 - system-icu? ( >=dev-libs/icu-63.1:= )" + >=sys-libs/zlib-1.2.3" RDEPEND="${DEPEND}" S="${WORKDIR}/firefox-${MY_PV}/js/src" @@ -117,19 +117,25 @@ src_configure() { 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 \ - --disable-optimize \ - --with-intl-api \ - $(use_with system-icu) \ $(use_enable debug) \ $(use_enable jit ion) \ $(use_enable test tests) \ - CONFIG_SHELL="${EPREFIX}/bin/bash" \ XARGS="${EPREFIX}/usr/bin/xargs" # restore PYTHON |