| 1 |
commit: b67430d2028ac285023796884012bd563bbf56cf |
| 2 |
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 7 14:59:18 2022 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 7 15:03:37 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b67430d2 |
| 7 |
|
| 8 |
dev-lang/spidermonkey: fix ebuilds to reflect latest llvm.eclass changes |
| 9 |
|
| 10 |
- also match lld checks to a slot. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/879177 |
| 13 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-lang/spidermonkey/spidermonkey-102.4.0.ebuild | 10 ++++++---- |
| 16 |
dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild | 10 ++++++---- |
| 17 |
dev-lang/spidermonkey/spidermonkey-91.13.0.ebuild | 10 ++++++---- |
| 18 |
3 files changed, 18 insertions(+), 12 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-lang/spidermonkey/spidermonkey-102.4.0.ebuild b/dev-lang/spidermonkey/spidermonkey-102.4.0.ebuild |
| 21 |
index 40a248c7290f..d78ef4c2e97f 100644 |
| 22 |
--- a/dev-lang/spidermonkey/spidermonkey-102.4.0.ebuild |
| 23 |
+++ b/dev-lang/spidermonkey/spidermonkey-102.4.0.ebuild |
| 24 |
@@ -113,8 +113,8 @@ llvm_check_deps() { |
| 25 |
fi |
| 26 |
|
| 27 |
if use lto ; then |
| 28 |
- if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then |
| 29 |
- einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 |
| 30 |
+ if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then |
| 31 |
+ einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 |
| 32 |
return 1 |
| 33 |
fi |
| 34 |
fi |
| 35 |
@@ -228,10 +228,12 @@ src_configure() { |
| 36 |
einfo "Current RUSTFLAGS: ${RUSTFLAGS}" |
| 37 |
|
| 38 |
local have_switched_compiler= |
| 39 |
- if use clang && ! tc-is-clang ; then |
| 40 |
+ if use clang; then |
| 41 |
# Force clang |
| 42 |
einfo "Enforcing the use of clang due to USE=clang ..." |
| 43 |
- have_switched_compiler=yes |
| 44 |
+ if tc-is-gcc; then |
| 45 |
+ have_switched_compiler=yes |
| 46 |
+ fi |
| 47 |
AR=llvm-ar |
| 48 |
AS=llvm-as |
| 49 |
CC=${CHOST}-clang |
| 50 |
|
| 51 |
diff --git a/dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild |
| 52 |
index 80ef8034aaa8..8af327dd9b6e 100644 |
| 53 |
--- a/dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild |
| 54 |
+++ b/dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild |
| 55 |
@@ -126,8 +126,8 @@ llvm_check_deps() { |
| 56 |
fi |
| 57 |
|
| 58 |
if use lto ; then |
| 59 |
- if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then |
| 60 |
- einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 |
| 61 |
+ if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then |
| 62 |
+ einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 |
| 63 |
return 1 |
| 64 |
fi |
| 65 |
fi |
| 66 |
@@ -252,10 +252,12 @@ src_configure() { |
| 67 |
einfo "Current RUSTFLAGS: ${RUSTFLAGS}" |
| 68 |
|
| 69 |
local have_switched_compiler= |
| 70 |
- if use clang && ! tc-is-clang ; then |
| 71 |
+ if use clang; then |
| 72 |
# Force clang |
| 73 |
einfo "Enforcing the use of clang due to USE=clang ..." |
| 74 |
- have_switched_compiler=yes |
| 75 |
+ if tc-is-gcc; then |
| 76 |
+ have_switched_compiler=yes |
| 77 |
+ fi |
| 78 |
AR=llvm-ar |
| 79 |
CC=${CHOST}-clang |
| 80 |
CXX=${CHOST}-clang++ |
| 81 |
|
| 82 |
diff --git a/dev-lang/spidermonkey/spidermonkey-91.13.0.ebuild b/dev-lang/spidermonkey/spidermonkey-91.13.0.ebuild |
| 83 |
index 6dc4ab9f813f..11f4cc2fe5e8 100644 |
| 84 |
--- a/dev-lang/spidermonkey/spidermonkey-91.13.0.ebuild |
| 85 |
+++ b/dev-lang/spidermonkey/spidermonkey-91.13.0.ebuild |
| 86 |
@@ -120,8 +120,8 @@ llvm_check_deps() { |
| 87 |
fi |
| 88 |
|
| 89 |
if use lto ; then |
| 90 |
- if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then |
| 91 |
- einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 |
| 92 |
+ if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then |
| 93 |
+ einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 |
| 94 |
return 1 |
| 95 |
fi |
| 96 |
fi |
| 97 |
@@ -235,10 +235,12 @@ src_configure() { |
| 98 |
einfo "Current RUSTFLAGS: ${RUSTFLAGS}" |
| 99 |
|
| 100 |
local have_switched_compiler= |
| 101 |
- if use clang && ! tc-is-clang ; then |
| 102 |
+ if use clang; then |
| 103 |
# Force clang |
| 104 |
einfo "Enforcing the use of clang due to USE=clang ..." |
| 105 |
- have_switched_compiler=yes |
| 106 |
+ if tc-is-gcc; then |
| 107 |
+ have_switched_compiler=yes |
| 108 |
+ fi |
| 109 |
AR=llvm-ar |
| 110 |
CC=${CHOST}-clang |
| 111 |
CXX=${CHOST}-clang++ |
Archives