| 1 |
commit: b6bfcfc2d41635e7ba926631619cf9b7d8eef02b |
| 2 |
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 7 14:56:25 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=b6bfcfc2 |
| 7 |
|
| 8 |
mail-client/thunderbird: fix ebuilds to reflect latest llvm.eclass changes |
| 9 |
|
| 10 |
- also match lld to a slot. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/879177 |
| 13 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 14 |
|
| 15 |
mail-client/thunderbird/thunderbird-102.4.0.ebuild | 10 ++++++---- |
| 16 |
mail-client/thunderbird/thunderbird-102.4.2.ebuild | 10 ++++++---- |
| 17 |
2 files changed, 12 insertions(+), 8 deletions(-) |
| 18 |
|
| 19 |
diff --git a/mail-client/thunderbird/thunderbird-102.4.0.ebuild b/mail-client/thunderbird/thunderbird-102.4.0.ebuild |
| 20 |
index 1ff0425c8ce4..50477ea0ed9b 100644 |
| 21 |
--- a/mail-client/thunderbird/thunderbird-102.4.0.ebuild |
| 22 |
+++ b/mail-client/thunderbird/thunderbird-102.4.0.ebuild |
| 23 |
@@ -200,8 +200,8 @@ llvm_check_deps() { |
| 24 |
fi |
| 25 |
|
| 26 |
if use clang ; then |
| 27 |
- if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then |
| 28 |
- einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 |
| 29 |
+ if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then |
| 30 |
+ einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 |
| 31 |
return 1 |
| 32 |
fi |
| 33 |
|
| 34 |
@@ -567,10 +567,12 @@ src_configure() { |
| 35 |
einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}" |
| 36 |
|
| 37 |
local have_switched_compiler= |
| 38 |
- if use clang && ! tc-is-clang ; then |
| 39 |
+ if use clang; then |
| 40 |
# Force clang |
| 41 |
einfo "Enforcing the use of clang due to USE=clang ..." |
| 42 |
- have_switched_compiler=yes |
| 43 |
+ if tc-is-gcc; then |
| 44 |
+ have_switched_compiler=yes |
| 45 |
+ fi |
| 46 |
AR=llvm-ar |
| 47 |
AS=llvm-as |
| 48 |
CC=${CHOST}-clang |
| 49 |
|
| 50 |
diff --git a/mail-client/thunderbird/thunderbird-102.4.2.ebuild b/mail-client/thunderbird/thunderbird-102.4.2.ebuild |
| 51 |
index b08367f7693f..0eb9f754ddff 100644 |
| 52 |
--- a/mail-client/thunderbird/thunderbird-102.4.2.ebuild |
| 53 |
+++ b/mail-client/thunderbird/thunderbird-102.4.2.ebuild |
| 54 |
@@ -200,8 +200,8 @@ llvm_check_deps() { |
| 55 |
fi |
| 56 |
|
| 57 |
if use clang ; then |
| 58 |
- if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then |
| 59 |
- einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 |
| 60 |
+ if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then |
| 61 |
+ einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 |
| 62 |
return 1 |
| 63 |
fi |
| 64 |
|
| 65 |
@@ -567,10 +567,12 @@ src_configure() { |
| 66 |
einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}" |
| 67 |
|
| 68 |
local have_switched_compiler= |
| 69 |
- if use clang && ! tc-is-clang ; then |
| 70 |
+ if use clang; then |
| 71 |
# Force clang |
| 72 |
einfo "Enforcing the use of clang due to USE=clang ..." |
| 73 |
- have_switched_compiler=yes |
| 74 |
+ if tc-is-gcc; then |
| 75 |
+ have_switched_compiler=yes |
| 76 |
+ fi |
| 77 |
AR=llvm-ar |
| 78 |
AS=llvm-as |
| 79 |
CC=${CHOST}-clang |
Archives