Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/spidermonkey/, profiles/arch/arm/armv4/, profiles/arch/arm/armv4t/, ...
Date: Mon, 07 Sep 2020 17:55:29
Message-Id: 1599501321.1c402440ba8d7afd42ae9e9ae1b790bbba39deb0.whissi@gentoo
1 commit: 1c402440ba8d7afd42ae9e9ae1b790bbba39deb0
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 7 17:53:45 2020 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 7 17:55:21 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c402440
7
8 dev-lang/spidermonkey: bump to v78.2.0
9
10 Package-Manager: Portage-3.0.5, Repoman-3.0.1
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 dev-lang/spidermonkey/Manifest | 3 +
14 dev-lang/spidermonkey/spidermonkey-78.2.0.ebuild | 251 +++++++++++++++++++++++
15 profiles/arch/arm/armv4/package.mask | 1 +
16 profiles/arch/arm/armv4t/package.mask | 1 +
17 profiles/arch/arm/armv5te/package.mask | 1 +
18 5 files changed, 257 insertions(+)
19
20 diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
21 index c85db0a830e..154013425ec 100644
22 --- a/dev-lang/spidermonkey/Manifest
23 +++ b/dev-lang/spidermonkey/Manifest
24 @@ -7,6 +7,8 @@ DIST firefox-68.12.0esr.source.tar.xz 313856956 BLAKE2B eeaa4acc9fabf15ec1b31317
25 DIST firefox-68.7.0esr.source.tar.xz 312235932 BLAKE2B 17030bc74341ecae74d7dadcb0fc0212e61e3f01463671e57f73c90e534db1088d597d43bc362cd083ca26b056bce45684eda121b2cd91c7793c44a7c40efb7a SHA512 a3ddcf8ffe5f568b30b1fc9ddcaa5cebe600bf11ce353c09507d5466f999022d45a0dee9a08f53f37b10202a2e2ce4c180743cd6a2ca38dfea1c3e4487b18593
26 DIST firefox-68.8.0esr.source.tar.xz 312602308 BLAKE2B 19be922cdadc705a267f35450e742cf9cf2f793a3e74dd9a397f898ff879cf9d7e59ccc148a9fa47f3c637c30887c205f01069e689f0586fb9ef82f4e6b160ce SHA512 139a63dc85ae76a50da6be9a31425f97144e6c7e4a65b0f3009a84eb5c8c9566f6bb331e26590f8aecd5045c4d730ab4e848cf7220f3444a31147b5533c742b3
27 DIST firefox-68.9.0esr.source.tar.xz 317469120 BLAKE2B f04f8ca1abe802edb6d37c0de5f8024d513331fd80c9b701c93de74cbafc0650b1c0f58e54a2dbe6bee0457698dc386093aab7749c9b0738bf146bfbae6bf4e2 SHA512 98431800d80f7c680aef9eede29df8217810912a319a7f7f8c2e637c43ecd4f4e29223a417afb2a6315e825f979453ff6e6b5a575649aba5cc63ce5956375bb8
28 +DIST firefox-78.2.0esr.source.tar.xz 331996944 BLAKE2B bd16877d078de66a418ae114c534b26313f112b9e40ad5cf112fb07a4d7335dc47071ee6e959e3e4c179b95afbdc5ab9cda7cdefa96355dbbaf6b75c7805d171 SHA512 38f91a24634ce5d0c10340c9ac762071f8488f4bd7649bff9ed9cb1cbecda23e207b593118d38488810540e63be39d9c1c45c3b9a6acb477b6b2edf636e56d5b
29 +DIST firefox-esr-78-patches-01.tar.xz 30808 BLAKE2B c3005a04233462c800ff0da7ba5e4f1e4d350c21e2642a93aa48637fcc19b8c0e97222669629a152ad6403652f83d4fdf3191b3c2741dca5327b101ef491d962 SHA512 7b2aba8dd4ff2f8ac3236ae95eec73aff3560e8f11f170f09b28ae2c7681dc0220ac63724a331dcc792c86e73145acee173a19bce5fcf995ba40ed5d067e1eff
30 DIST js-1.7.0.tar.gz 1165607 BLAKE2B 61749e10886bbb9e4958a41925fae8dcbd7d943b9bf838878368c30e26ba61f300bc2ec37982653b87fedf76707dda2ffd510282de4bce87d1da11ca42fa108c SHA512 9d9fbd9c1dae969ca19ddb0f977ac56f3e0479ec393b859de252fcdd8b7fc325e80399073540884ed365ce56a3219be34c0db9300d5e50f32969660c90527e51
31 DIST js185-1.0.0.tar.gz 6164605 BLAKE2B 76a37f0ceae05d3475853875bd0ce4be6e525e4114816f8f281ea6fc6b60a71060975a0fa1cb843f57ad1e2f842dfb26b24244fa0fd6c20f6ae2ebbe430f70be SHA512 2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718
32 DIST mozjs-38.3.0sfink2.tar.bz2 27232902 BLAKE2B 42a039a41b7479a32e22f260cb58f098e1a1d4833f801f193bdd8b75403f94567b9ef2ebe85b2a811fe2f9b27cd934afe1054bd4e7d9aae0b8a80acdec8e42a4 SHA512 debad1fbd21e025c567b083677cfd0a2023ec2aff750241f495ac2977034a7299e068cb3b0b2351c97457119cc8aef563f00416092a70a3a269d20947b700206
33 @@ -18,6 +20,7 @@ DIST spidermonkey-52.0-patches-0.tar.xz 5172 BLAKE2B 8bcf9477de47ef3b882cd3281ef
34 DIST spidermonkey-52.0-patches-1.tar.xz 3112 BLAKE2B d8f4c44cb2ae290fa51efc4725a2c1b3cd85dd9f04f4ccfa5681ba6df5f37f5d8d4ad6859316a70d0f7647ac2cee014d126f88b7d4ca74a82796f35b141200ef SHA512 5328403e3b9ecd1c456037e7cca374c2453d9331752c48b9466e498e22fd8d4ca6e1804e51140ee0be027fcef7d0c3f26822b1f569305a3b2f03209b7fb15499
35 DIST spidermonkey-60.0-patches-04.tar.xz 4428 BLAKE2B af78049cd9b3ee6a9b689e6253486c4670fd3b506faade7d745dafaa7af329c0bd15cd35e95528a4c96688230f4803130967fb09b97aae2bda0ce0f73acaaf3e SHA512 fb1326a81512146ba98773d4f7e0c4bc1bff0f076897c13f576fcf63b56f6965efeff633eea9160bca9f9bc4546505901084eabc33bc955de0b7ab3d6334387a
36 DIST spidermonkey-68.6.0-patches-03.tar.xz 4744 BLAKE2B 2a323ea9b6291e427631f986822e779cd3d302b617a827ff020760bb1b19cacbc588d5c76637e386f62b8b64036b0b665bfecae7fdb08477fa5d7fb13630523c SHA512 1465331b61abc9c14245bc6510f1f6996274795853d12d209d7e0a088b37a1a2488cc5cc61a6c2bd0fe05971dad54b19614fb477ec3176b240aa6e0190e89b47
37 +DIST spidermonkey-78-patches-01.tar.xz 2100 BLAKE2B 5001c30c395c3ad4f77eb2c3f542f5547184b9c7493988b9433a175853983020b4c450efb674ea94e2575be50f9aff36d0e1418777327b7c806c52e37e8be556 SHA512 d31a037ebdda4a1b9d9a53881f5e5d3d547349b3fe4a0dbcf1c1cd27ff8076ee71186f080358fde586af8305cc82283c5fa67f4101637272078d057100a24065
38 DIST spidermonkey-slot0-patches-01.tar.xz 10488 BLAKE2B 4a5195ac11d1076046424fc10d1416d097fb230cd8b0b28ac8b65d379e0c0518586ced0f48f833dea52b13fb5d300e02664657ab2479bfcc343bc358d394d5d7 SHA512 6c878ed0b50c052989a8b965fed845e9c672b691f4c4b1f98ee82e81a33880e1e6bf1dac8222d71322553282de602a88272dedebbcf50d27967fc172f0a8054a
39 DIST spidermonkey-slot0-patches-02.tar.xz 10952 BLAKE2B fb7bf5cdac6c821a48d407ff172fe0ec7297e047d3b3bab952f226f413b83ea70325175b41c1680725ff588111b424efc97a0c66e392989da510c43d38528ff1 SHA512 cd62890c4b58658d99fc1b52f05ccb35c07da835b168bb9d5e6b219de5021122c199cc2255c5b0be01ef582f53dd51c9975921e6bde9f14e9b43536e2bee85f2
40 DIST spidermonkey-slot17-patches-01.tar.xz 2748 BLAKE2B a55504d726f925096de7e066a1d323154bc796018644f347bc1d012ea6ee8441cc19f30689e06fd26bab5a5d2e8376e90bf2c1930a588be8b48865f7bbc524ea SHA512 21a90f85d156de3cca9811317507162a458f908bb447924fcfbf49b7bb70496b611ce7df90b90775316b8ceafda56692be3bf856b168b83ed40b8a5c668eed3f
41
42 diff --git a/dev-lang/spidermonkey/spidermonkey-78.2.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.2.0.ebuild
43 new file mode 100644
44 index 00000000000..cbc97965855
45 --- /dev/null
46 +++ b/dev-lang/spidermonkey/spidermonkey-78.2.0.ebuild
47 @@ -0,0 +1,251 @@
48 +# Copyright 1999-2020 Gentoo Authors
49 +# Distributed under the terms of the GNU General Public License v2
50 +
51 +EAPI="7"
52 +
53 +PYTHON_COMPAT=( python3_{6..9} )
54 +
55 +WANT_AUTOCONF="2.1"
56 +
57 +inherit autotools check-reqs multiprocessing python-any-r1
58 +
59 +MY_PN="mozjs"
60 +MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
61 +
62 +MY_MAJOR=$(ver_cut 1)
63 +
64 +MOZ_ESR="1"
65 +
66 +# Convert the ebuild version to the upstream mozilla version
67 +MOZ_PV="${MY_PV/_alpha/a}" # Handle alpha for SRC_URI
68 +MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
69 +MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI
70 +
71 +if [[ ${MOZ_ESR} == 1 ]] ; then
72 + # ESR releases have slightly different version numbers
73 + MOZ_PV="${MOZ_PV}esr"
74 +fi
75 +
76 +# Patch version
77 +FIREFOX_PATCHSET="firefox-esr-78-patches-01.tar.xz"
78 +SPIDERMONKEY_PATCHSET="spidermonkey-78-patches-01.tar.xz"
79 +
80 +MOZ_HTTP_URI="https://archive.mozilla.org/pub/firefox/releases"
81 +MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
82 +
83 +if [[ "${PV}" == *_rc* ]]; then
84 + MOZ_HTTP_URI="https://archive.mozilla.org/pub/firefox/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
85 + MOZ_SRC_URI="${MOZ_HTTP_URI}/source/firefox-${MOZ_PV}.source.tar.xz"
86 +fi
87 +
88 +PATCH_URIS=(
89 + https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${FIREFOX_PATCHSET}
90 + https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${SPIDERMONKEY_PATCHSET}
91 +)
92 +
93 +SRC_URI="${MOZ_SRC_URI}
94 + ${PATCH_URIS[@]}"
95 +
96 +DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
97 +HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
98 +
99 +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~s390 ~x86"
100 +
101 +SLOT="78"
102 +LICENSE="MPL-2.0"
103 +IUSE="debug +jit test"
104 +
105 +RESTRICT="!test? ( test )"
106 +
107 +BDEPEND="${PYTHON_DEPS}
108 + virtual/pkgconfig"
109 +
110 +CDEPEND=">=dev-libs/icu-67.1:=
111 + >=dev-libs/nspr-4.25
112 + sys-libs/readline:0=
113 + >=sys-libs/zlib-1.2.3"
114 +
115 +DEPEND="${CDEPEND}
116 + >=virtual/rust-1.43.0
117 + test? (
118 + $(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
119 + )"
120 +
121 +RDEPEND="${CDEPEND}"
122 +
123 +S="${WORKDIR}/firefox-${MY_PV}/js/src"
124 +
125 +python_check_deps() {
126 + if use test ; then
127 + has_version "dev-python/six[${PYTHON_USEDEP}]"
128 + fi
129 +}
130 +
131 +pkg_pretend() {
132 + if use test ; then
133 + CHECKREQS_DISK_BUILD="6400M"
134 + else
135 + CHECKREQS_DISK_BUILD="5300M"
136 + fi
137 +
138 + check-reqs_pkg_pretend
139 +}
140 +
141 +pkg_setup() {
142 + if use test ; then
143 + CHECKREQS_DISK_BUILD="6400M"
144 + else
145 + CHECKREQS_DISK_BUILD="5300M"
146 + fi
147 +
148 + check-reqs_pkg_setup
149 +
150 + python-any-r1_pkg_setup
151 +}
152 +
153 +src_prepare() {
154 + pushd ../.. &>/dev/null || die
155 +
156 + eapply "${WORKDIR}"/firefox
157 + eapply "${WORKDIR}"/spidermonkey-patches
158 +
159 + default
160 +
161 + # Make LTO respect MAKEOPTS
162 + sed -i \
163 + -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
164 + build/moz.configure/lto-pgo.configure \
165 + || die "sed failed to set num_cores"
166 +
167 + # sed-in toolchain prefix
168 + sed -i \
169 + -e "s/objdump/${CHOST}-objdump/" \
170 + python/mozbuild/mozbuild/configure/check_debug_ranges.py \
171 + || die "sed failed to set toolchain prefix"
172 +
173 + einfo "Removing pre-built binaries ..."
174 + find third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
175 +
176 + MOZJS_BUILDDIR="${WORKDIR}/build"
177 + mkdir "${MOZJS_BUILDDIR}" || die
178 +
179 + popd &>/dev/null || die
180 + eautoconf
181 +}
182 +
183 +src_configure() {
184 + tc-export CC CXX LD AR RANLIB
185 +
186 + cd "${MOZJS_BUILDDIR}" || die
187 +
188 + # ../python/mach/mach/mixin/process.py fails to detect SHELL
189 + export SHELL="${EPREFIX}/bin/bash"
190 +
191 + # forcing system-icu allows us to skip patching bundled ICU for PPC
192 + # and other minor arches
193 + ECONF_SOURCE="${S}" \
194 + econf \
195 + --host="${CBUILD:-${CHOST}}" \
196 + --target="${CHOST}" \
197 + --disable-jemalloc \
198 + --disable-optimize \
199 + --disable-strip \
200 + --enable-readline \
201 + --enable-shared-js \
202 + --with-intl-api \
203 + --with-system-icu \
204 + --with-system-nspr \
205 + --with-system-zlib \
206 + --with-toolchain-prefix="${CHOST}-" \
207 + $(use_enable debug) \
208 + $(use_enable jit) \
209 + $(use_enable test tests) \
210 + XARGS="${EPREFIX}/usr/bin/xargs"
211 +}
212 +
213 +src_compile() {
214 + cd "${MOZJS_BUILDDIR}" || die
215 + default
216 +}
217 +
218 +src_test() {
219 + if "${MOZJS_BUILDDIR}/js/src/js" -e 'print("Hello world!")'; then
220 + einfo "Smoke-test successful, continuing with full test suite"
221 + else
222 + die "Smoke-test failed: did interpreter initialization fail?"
223 + fi
224 +
225 + local -a KNOWN_TESTFAILURES
226 + KNOWN_TESTFAILURES+=( non262/Date/reset-time-zone-cache-same-offset.js )
227 + KNOWN_TESTFAILURES+=( non262/Date/time-zone-path.js )
228 + KNOWN_TESTFAILURES+=( non262/Date/time-zones-historic.js )
229 + KNOWN_TESTFAILURES+=( non262/Date/time-zones-imported.js )
230 + KNOWN_TESTFAILURES+=( non262/Date/toString-localized.js )
231 + KNOWN_TESTFAILURES+=( non262/Date/toString-localized-posix.js )
232 + KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/timeZone_backward_links.js )
233 + KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/tz-environment-variable.js )
234 + KNOWN_TESTFAILURES+=( non262/Intl/Locale/likely-subtags.js )
235 + KNOWN_TESTFAILURES+=( test262/intl402/Locale/prototype/minimize/removing-likely-subtags-first-adds-likely-subtags.js )
236 +
237 + if use x86 ; then
238 + KNOWN_TESTFAILURES+=( non262/Date/timeclip.js )
239 + KNOWN_TESTFAILURES+=( test262/built-ins/Number/prototype/toPrecision/return-values.js )
240 + KNOWN_TESTFAILURES+=( test262/language/types/number/S8.5_A2.1.js )
241 + KNOWN_TESTFAILURES+=( test262/language/types/number/S8.5_A2.2.js )
242 + fi
243 +
244 + echo "" > "${T}"/known_failures.list || die
245 +
246 + local KNOWN_TESTFAILURE
247 + for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
248 + echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list
249 + done
250 +
251 + PYTHONPATH="${S}/tests/lib" \
252 + ${PYTHON} \
253 + "${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
254 + --exclude-file="${T}"/known_failures.list \
255 + "${MOZJS_BUILDDIR}"/js/src/js \
256 + || die
257 +
258 + if use jit ; then
259 + KNOWN_TESTFAILURES=()
260 +
261 + echo "" > "${T}"/known_failures.list || die
262 +
263 + for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
264 + echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list
265 + done
266 +
267 + PYTHONPATH="${S}/tests/lib" \
268 + ${PYTHON} \
269 + "${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
270 + --exclude-file="${T}"/known_failures.list \
271 + "${MOZJS_BUILDDIR}"/js/src/js basic \
272 + || die
273 + fi
274 +}
275 +
276 +src_install() {
277 + cd "${MOZJS_BUILDDIR}" || die
278 + default
279 +
280 + # fix soname links
281 + pushd "${ED}"/usr/$(get_libdir) &>/dev/null || die
282 + mv lib${MY_PN}-${MY_MAJOR}.so lib${MY_PN}-${MY_MAJOR}.so.0.0.0 || die
283 + ln -s lib${MY_PN}-${MY_MAJOR}.so.0.0.0 lib${MY_PN}-${MY_MAJOR}.so.0 || die
284 + ln -s lib${MY_PN}-${MY_MAJOR}.so.0 lib${MY_PN}-${MY_MAJOR}.so || die
285 + popd &>/dev/null || die
286 +
287 + # remove unneeded files
288 + rm \
289 + "${ED}"/usr/bin/js${MY_MAJOR}-config \
290 + "${ED}"/usr/$(get_libdir)/libjs_static.ajs \
291 + || die
292 +
293 + # fix permissions
294 + chmod -x \
295 + "${ED}"/usr/$(get_libdir)/pkgconfig/*.pc \
296 + "${ED}"/usr/include/mozjs-${MY_MAJOR}/js-config.h \
297 + || die
298 +}
299
300 diff --git a/profiles/arch/arm/armv4/package.mask b/profiles/arch/arm/armv4/package.mask
301 index ebbb9d3323f..b2bb15d4515 100644
302 --- a/profiles/arch/arm/armv4/package.mask
303 +++ b/profiles/arch/arm/armv4/package.mask
304 @@ -6,6 +6,7 @@ dev-lang/nim
305 dev-lang/rust-bin
306 dev-lang/rust
307 virtual/rust
308 +>=dev-lang/spidermonkey-78
309 >=gnome-base/librsvg-2.41
310 >=gnome-base/gnome-core-libs-3.36.5
311 >=gnome-base/gnome-core-apps-3.36.5
312
313 diff --git a/profiles/arch/arm/armv4t/package.mask b/profiles/arch/arm/armv4t/package.mask
314 index ebbb9d3323f..b2bb15d4515 100644
315 --- a/profiles/arch/arm/armv4t/package.mask
316 +++ b/profiles/arch/arm/armv4t/package.mask
317 @@ -6,6 +6,7 @@ dev-lang/nim
318 dev-lang/rust-bin
319 dev-lang/rust
320 virtual/rust
321 +>=dev-lang/spidermonkey-78
322 >=gnome-base/librsvg-2.41
323 >=gnome-base/gnome-core-libs-3.36.5
324 >=gnome-base/gnome-core-apps-3.36.5
325
326 diff --git a/profiles/arch/arm/armv5te/package.mask b/profiles/arch/arm/armv5te/package.mask
327 index 71c459a7e8e..3d3fb68506d 100644
328 --- a/profiles/arch/arm/armv5te/package.mask
329 +++ b/profiles/arch/arm/armv5te/package.mask
330 @@ -6,6 +6,7 @@ dev-lang/nim
331 dev-lang/rust-bin
332 dev-lang/rust
333 virtual/rust
334 +>=dev-lang/spidermonkey-78
335 >=gnome-base/librsvg-2.41
336 >=gnome-base/gnome-core-libs-3.36.5
337 >=gnome-base/gnome-core-apps-3.36.5