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: Mon, 07 Sep 2020 21:59:18
Message-Id: 1599515946.2caf8004b7c582d65d1d01a96f32febdedcb8fdd.whissi@gentoo
1 commit: 2caf8004b7c582d65d1d01a96f32febdedcb8fdd
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 7 21:20:59 2020 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 7 21:59:06 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2caf8004
7
8 dev-lang/spidermonkey: clang/LLVM is required
9
10 Closes: https://bugs.gentoo.org/740890
11 Package-Manager: Portage-3.0.5, Repoman-3.0.1
12 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
13
14 dev-lang/spidermonkey/spidermonkey-78.2.0.ebuild | 16 +++++++++++++++-
15 1 file changed, 15 insertions(+), 1 deletion(-)
16
17 diff --git a/dev-lang/spidermonkey/spidermonkey-78.2.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.2.0.ebuild
18 index c41e32dbc5c..28d49a10116 100644
19 --- a/dev-lang/spidermonkey/spidermonkey-78.2.0.ebuild
20 +++ b/dev-lang/spidermonkey/spidermonkey-78.2.0.ebuild
21 @@ -7,7 +7,9 @@ PYTHON_COMPAT=( python3_{6..9} )
22
23 WANT_AUTOCONF="2.1"
24
25 -inherit autotools check-reqs multiprocessing python-any-r1
26 +LLVM_MAX_SLOT=10
27 +
28 +inherit autotools check-reqs llvm multiprocessing python-any-r1
29
30 MY_PN="mozjs"
31 MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
32 @@ -58,6 +60,7 @@ IUSE="debug +jit test"
33 RESTRICT="!test? ( test )"
34
35 BDEPEND="${PYTHON_DEPS}
36 + sys-devel/clang
37 >=virtual/rust-1.43.0
38 virtual/pkgconfig"
39
40 @@ -75,6 +78,15 @@ RDEPEND="${CDEPEND}"
41
42 S="${WORKDIR}/firefox-${MY_PV}/js/src"
43
44 +llvm_check_deps() {
45 + if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
46 + ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
47 + return 1
48 + fi
49 +
50 + einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
51 +}
52 +
53 python_check_deps() {
54 if use test ; then
55 has_version "dev-python/six[${PYTHON_USEDEP}]"
56 @@ -100,6 +112,8 @@ pkg_setup() {
57
58 check-reqs_pkg_setup
59
60 + llvm_pkg_setup
61 +
62 python-any-r1_pkg_setup
63 }