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/
Date: Wed, 30 Sep 2020 01:15:51
Message-Id: 1601428538.8903e4c6ead9b877eacf6a15b300f9423fa8943c.whissi@gentoo
1 commit: 8903e4c6ead9b877eacf6a15b300f9423fa8943c
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 30 01:15:38 2020 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 30 01:15:38 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8903e4c6
7
8 dev-lang/spidermonkey: bump to v78.3.0
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.1
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 dev-lang/spidermonkey/Manifest | 2 +
14 dev-lang/spidermonkey/spidermonkey-78.3.0.ebuild | 267 +++++++++++++++++++++++
15 2 files changed, 269 insertions(+)
16
17 diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
18 index 522629cc33d..540d0dd4f2a 100644
19 --- a/dev-lang/spidermonkey/Manifest
20 +++ b/dev-lang/spidermonkey/Manifest
21 @@ -1,7 +1,9 @@
22 DIST firefox-68.0-patches-15.tar.xz 16060 BLAKE2B f9e6cd58ea51bed1af90a9d30fd551dc7e939afcd1b4d00de1271bd4bda94021c6f1799fd9945962c14ffa1fd0b6a6429369c4e45efc2000f179b9b2e46971e7 SHA512 9cb2479637dd8b84e0ab68dc0fe144acd2dc74feca282fd3c4b485ca6f0de8190244587622713a5421b243ccda153f738e9a8f463e87e15e93e9b725d943e128
23 DIST firefox-68.12.0esr.source.tar.xz 313856956 BLAKE2B eeaa4acc9fabf15ec1b313170a30cee8e1fc10a8b08512b915b83b7d6a81c09b365733ed94638bd434864fd7b0cb8cbf1bc2e43441be69e31117e8e6a099234c SHA512 839b02422e4c87bdb12e0995cd35ca8c1996f3fba00bbb46b419e46b67df5ec48a264cb14632db777ce29166ee4fdcb06e2ee3ce847e64328c58c9a2f9129f4c
24 DIST firefox-78.2.0esr.source.tar.xz 331996944 BLAKE2B bd16877d078de66a418ae114c534b26313f112b9e40ad5cf112fb07a4d7335dc47071ee6e959e3e4c179b95afbdc5ab9cda7cdefa96355dbbaf6b75c7805d171 SHA512 38f91a24634ce5d0c10340c9ac762071f8488f4bd7649bff9ed9cb1cbecda23e207b593118d38488810540e63be39d9c1c45c3b9a6acb477b6b2edf636e56d5b
25 +DIST firefox-78.3.0esr.source.tar.xz 331073228 BLAKE2B 01f3d3c0b8b963dedfa89631c518225104c739637a8bf22c121e3a942fa0b1d1f8cf1c4c2edad2e823e0e3922f865cc8d3430c6fc9246deea855295eaff84a0e SHA512 89e12797429d99760b294e302d803432f533b7c2c10f1fcd3781b89b27ec9698173d4fbf1bfe7506186602daf6666c09152407ce5668fb5b7391e38b5566f2f2
26 DIST firefox-esr-78-patches-01.tar.xz 30808 BLAKE2B c3005a04233462c800ff0da7ba5e4f1e4d350c21e2642a93aa48637fcc19b8c0e97222669629a152ad6403652f83d4fdf3191b3c2741dca5327b101ef491d962 SHA512 7b2aba8dd4ff2f8ac3236ae95eec73aff3560e8f11f170f09b28ae2c7681dc0220ac63724a331dcc792c86e73145acee173a19bce5fcf995ba40ed5d067e1eff
27 +DIST firefox-esr-78-patches-02.tar.xz 36288 BLAKE2B f177027ea550b4f41616c104865a4d1a99fa0a84ca431176b5191107f23b2fcdd8361ad97493d3182d01dfeb7f2805caf16725b8a81bf1f7847cf400f87018d6 SHA512 7eff0a4f5d2b4abcb0293877b3fe562b5fa2581f46b4905ff8ad839559049e4d903dcca4aad6a7196720cc7b3cd93ae88ca0093da51f70e56609faaadf646c78
28 DIST js185-1.0.0.tar.gz 6164605 BLAKE2B 76a37f0ceae05d3475853875bd0ce4be6e525e4114816f8f281ea6fc6b60a71060975a0fa1cb843f57ad1e2f842dfb26b24244fa0fd6c20f6ae2ebbe430f70be SHA512 2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718
29 DIST mozjs-52.9.1pre1.tar.bz2 30178574 BLAKE2B 0920432b5140e78297a9bcbccb54268d75a223d5e75e4ff90b3b01aab4f7736b4a4e05c47b3a925ff0a74607a0abad3b6583c75d070ef5142009b20ebaf6e4bf SHA512 187b231b246a5ae09e55c0fef77866b316d75f38f4c2e066d5d4325d8da63433027020c929439cab46af3253ac63ab2f780223a8fd2c6ff535b3409bb6c4aa0f
30 DIST mozjs-60.5.2.tar.bz2 32816585 BLAKE2B 45ac4c9646e1275faf60eeedbf486f802cd106583eb7f640fe2243adc7cbb811dced5cefa94426cceca63468b0112be84078ffcef24cb2b8c1a7b6c8173c0d45 SHA512 5fb73330e7803bdd524fbe7cfdf4e6b72e85d4b22b0c827400317b5d052d1088d36e558ceac376393089e9d03e658b24e69262851fc04a66bbcda47135423dc0
31
32 diff --git a/dev-lang/spidermonkey/spidermonkey-78.3.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.3.0.ebuild
33 new file mode 100644
34 index 00000000000..beec6244426
35 --- /dev/null
36 +++ b/dev-lang/spidermonkey/spidermonkey-78.3.0.ebuild
37 @@ -0,0 +1,267 @@
38 +# Copyright 1999-2020 Gentoo Authors
39 +# Distributed under the terms of the GNU General Public License v2
40 +
41 +EAPI="7"
42 +
43 +PYTHON_COMPAT=( python3_{6..9} )
44 +
45 +WANT_AUTOCONF="2.1"
46 +
47 +inherit autotools check-reqs multiprocessing python-any-r1 toolchain-funcs
48 +
49 +MY_PN="mozjs"
50 +MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
51 +
52 +MY_MAJOR=$(ver_cut 1)
53 +
54 +MOZ_ESR="1"
55 +
56 +# Convert the ebuild version to the upstream mozilla version
57 +MOZ_PV="${MY_PV/_alpha/a}" # Handle alpha for SRC_URI
58 +MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
59 +MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI
60 +
61 +if [[ ${MOZ_ESR} == 1 ]] ; then
62 + # ESR releases have slightly different version numbers
63 + MOZ_PV="${MOZ_PV}esr"
64 +fi
65 +
66 +# Patch version
67 +FIREFOX_PATCHSET="firefox-esr-78-patches-02.tar.xz"
68 +SPIDERMONKEY_PATCHSET="spidermonkey-78-patches-01.tar.xz"
69 +
70 +MOZ_HTTP_URI="https://archive.mozilla.org/pub/firefox/releases"
71 +MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
72 +
73 +if [[ "${PV}" == *_rc* ]]; then
74 + MOZ_HTTP_URI="https://archive.mozilla.org/pub/firefox/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
75 + MOZ_SRC_URI="${MOZ_HTTP_URI}/source/firefox-${MOZ_PV}.source.tar.xz"
76 +fi
77 +
78 +PATCH_URIS=(
79 + https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${FIREFOX_PATCHSET}
80 + https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${SPIDERMONKEY_PATCHSET}
81 +)
82 +
83 +SRC_URI="${MOZ_SRC_URI}
84 + ${PATCH_URIS[@]}"
85 +
86 +DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
87 +HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
88 +
89 +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~s390 ~x86"
90 +
91 +SLOT="78"
92 +LICENSE="MPL-2.0"
93 +IUSE="cpu_flags_arm_neon debug +jit test"
94 +
95 +RESTRICT="!test? ( test )"
96 +
97 +BDEPEND="${PYTHON_DEPS}
98 + sys-devel/llvm
99 + >=virtual/rust-1.41.0
100 + virtual/pkgconfig"
101 +
102 +CDEPEND=">=dev-libs/icu-67.1:=
103 + >=dev-libs/nspr-4.25
104 + sys-libs/readline:0=
105 + >=sys-libs/zlib-1.2.3"
106 +
107 +DEPEND="${CDEPEND}
108 + test? (
109 + $(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
110 + )"
111 +
112 +RDEPEND="${CDEPEND}"
113 +
114 +S="${WORKDIR}/firefox-${MY_PV}/js/src"
115 +
116 +python_check_deps() {
117 + if use test ; then
118 + has_version "dev-python/six[${PYTHON_USEDEP}]"
119 + fi
120 +}
121 +
122 +pkg_pretend() {
123 + if use test ; then
124 + CHECKREQS_DISK_BUILD="6400M"
125 + else
126 + CHECKREQS_DISK_BUILD="5600M"
127 + fi
128 +
129 + check-reqs_pkg_pretend
130 +}
131 +
132 +pkg_setup() {
133 + if use test ; then
134 + CHECKREQS_DISK_BUILD="6400M"
135 + else
136 + CHECKREQS_DISK_BUILD="5600M"
137 + fi
138 +
139 + check-reqs_pkg_setup
140 +
141 + python-any-r1_pkg_setup
142 +}
143 +
144 +src_prepare() {
145 + pushd ../.. &>/dev/null || die
146 +
147 + eapply "${WORKDIR}"/firefox-patches
148 + eapply "${WORKDIR}"/spidermonkey-patches
149 +
150 + default
151 +
152 + # Make LTO respect MAKEOPTS
153 + sed -i \
154 + -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
155 + build/moz.configure/lto-pgo.configure \
156 + || die "sed failed to set num_cores"
157 +
158 + # sed-in toolchain prefix
159 + sed -i \
160 + -e "s/objdump/${CHOST}-objdump/" \
161 + python/mozbuild/mozbuild/configure/check_debug_ranges.py \
162 + || die "sed failed to set toolchain prefix"
163 +
164 + einfo "Removing pre-built binaries ..."
165 + find third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
166 +
167 + MOZJS_BUILDDIR="${WORKDIR}/build"
168 + mkdir "${MOZJS_BUILDDIR}" || die
169 +
170 + popd &>/dev/null || die
171 + eautoconf
172 +}
173 +
174 +src_configure() {
175 + tc-export CC CXX LD AR RANLIB
176 +
177 + cd "${MOZJS_BUILDDIR}" || die
178 +
179 + # ../python/mach/mach/mixin/process.py fails to detect SHELL
180 + export SHELL="${EPREFIX}/bin/bash"
181 +
182 + local -a myeconfargs=(
183 + --host="${CBUILD:-${CHOST}}"
184 + --target="${CHOST}"
185 + --disable-jemalloc
186 + --disable-optimize
187 + --disable-strip
188 + --enable-readline
189 + --enable-shared-js
190 + --with-intl-api
191 + --with-system-icu
192 + --with-system-nspr
193 + --with-system-zlib
194 + --with-toolchain-prefix="${CHOST}-"
195 + $(use_enable debug)
196 + $(use_enable jit)
197 + $(use_enable test tests)
198 + )
199 +
200 + # Modifications to better support ARM, bug 717344
201 + if use cpu_flags_arm_neon ; then
202 + myeconfargs+=( --with-fpu=neon )
203 +
204 + if ! tc-is-clang ; then
205 + # thumb options aren't supported when using clang, bug 666966
206 + myeconfargs+=( --with-thumb=yes )
207 + myeconfargs+=( --with-thumb-interwork=no )
208 + fi
209 + fi
210 +
211 + # Forcing system-icu allows us to skip patching bundled ICU for PPC
212 + # and other minor arches
213 + ECONF_SOURCE="${S}" \
214 + econf \
215 + ${myeconfargs[@]} \
216 + XARGS="${EPREFIX}/usr/bin/xargs"
217 +}
218 +
219 +src_compile() {
220 + cd "${MOZJS_BUILDDIR}" || die
221 + default
222 +}
223 +
224 +src_test() {
225 + if "${MOZJS_BUILDDIR}/js/src/js" -e 'print("Hello world!")'; then
226 + einfo "Smoke-test successful, continuing with full test suite"
227 + else
228 + die "Smoke-test failed: did interpreter initialization fail?"
229 + fi
230 +
231 + local -a KNOWN_TESTFAILURES
232 + KNOWN_TESTFAILURES+=( non262/Date/reset-time-zone-cache-same-offset.js )
233 + KNOWN_TESTFAILURES+=( non262/Date/time-zone-path.js )
234 + KNOWN_TESTFAILURES+=( non262/Date/time-zones-historic.js )
235 + KNOWN_TESTFAILURES+=( non262/Date/time-zones-imported.js )
236 + KNOWN_TESTFAILURES+=( non262/Date/toString-localized.js )
237 + KNOWN_TESTFAILURES+=( non262/Date/toString-localized-posix.js )
238 + KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/timeZone_backward_links.js )
239 + KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/tz-environment-variable.js )
240 + KNOWN_TESTFAILURES+=( non262/Intl/Locale/likely-subtags.js )
241 + KNOWN_TESTFAILURES+=( test262/intl402/Locale/prototype/minimize/removing-likely-subtags-first-adds-likely-subtags.js )
242 +
243 + if use x86 ; then
244 + KNOWN_TESTFAILURES+=( non262/Date/timeclip.js )
245 + KNOWN_TESTFAILURES+=( test262/built-ins/Number/prototype/toPrecision/return-values.js )
246 + KNOWN_TESTFAILURES+=( test262/language/types/number/S8.5_A2.1.js )
247 + KNOWN_TESTFAILURES+=( test262/language/types/number/S8.5_A2.2.js )
248 + fi
249 +
250 + echo "" > "${T}"/known_failures.list || die
251 +
252 + local KNOWN_TESTFAILURE
253 + for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
254 + echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list
255 + done
256 +
257 + PYTHONPATH="${S}/tests/lib" \
258 + ${PYTHON} \
259 + "${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
260 + --exclude-file="${T}"/known_failures.list \
261 + "${MOZJS_BUILDDIR}"/js/src/js \
262 + || die
263 +
264 + if use jit ; then
265 + KNOWN_TESTFAILURES=()
266 +
267 + echo "" > "${T}"/known_failures.list || die
268 +
269 + for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
270 + echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list
271 + done
272 +
273 + PYTHONPATH="${S}/tests/lib" \
274 + ${PYTHON} \
275 + "${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
276 + --exclude-file="${T}"/known_failures.list \
277 + "${MOZJS_BUILDDIR}"/js/src/js basic \
278 + || die
279 + fi
280 +}
281 +
282 +src_install() {
283 + cd "${MOZJS_BUILDDIR}" || die
284 + default
285 +
286 + # fix soname links
287 + pushd "${ED}"/usr/$(get_libdir) &>/dev/null || die
288 + mv lib${MY_PN}-${MY_MAJOR}.so lib${MY_PN}-${MY_MAJOR}.so.0.0.0 || die
289 + ln -s lib${MY_PN}-${MY_MAJOR}.so.0.0.0 lib${MY_PN}-${MY_MAJOR}.so.0 || die
290 + ln -s lib${MY_PN}-${MY_MAJOR}.so.0 lib${MY_PN}-${MY_MAJOR}.so || die
291 + popd &>/dev/null || die
292 +
293 + # remove unneeded files
294 + rm \
295 + "${ED}"/usr/bin/js${MY_MAJOR}-config \
296 + "${ED}"/usr/$(get_libdir)/libjs_static.ajs \
297 + || die
298 +
299 + # fix permissions
300 + chmod -x \
301 + "${ED}"/usr/$(get_libdir)/pkgconfig/*.pc \
302 + "${ED}"/usr/include/mozjs-${MY_MAJOR}/js-config.h \
303 + || die
304 +}