summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoonas Niilola <juippis@gentoo.org>2022-11-17 14:46:26 +0200
committerJoonas Niilola <juippis@gentoo.org>2022-11-17 14:46:26 +0200
commit4e7c4c14b8a673efd06a7b0d9fc9e67123e72366 (patch)
tree39b6645052d236566c21c34152e2047d4763a18c /mail-client
parentwww-client/firefox: stabilize 102.5.0 for amd64 (diff)
downloadgentoo-4e7c4c14b8a673efd06a7b0d9fc9e67123e72366.tar.gz
gentoo-4e7c4c14b8a673efd06a7b0d9fc9e67123e72366.tar.bz2
gentoo-4e7c4c14b8a673efd06a7b0d9fc9e67123e72366.zip
mail-client/thunderbird: sync the llvm-rust updates from firefox to tb
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'mail-client')
-rw-r--r--mail-client/thunderbird/thunderbird-102.5.0.ebuild26
1 files changed, 8 insertions, 18 deletions
diff --git a/mail-client/thunderbird/thunderbird-102.5.0.ebuild b/mail-client/thunderbird/thunderbird-102.5.0.ebuild
index 9d4698c7519d..69b2c9fb81f6 100644
--- a/mail-client/thunderbird/thunderbird-102.5.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-102.5.0.ebuild
@@ -87,6 +87,7 @@ BDEPEND="${PYTHON_DEPS}
sys-devel/llvm:15
clang? (
sys-devel/lld:15
+ virtual/rust:0/llvm-15
pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] )
)
)
@@ -95,14 +96,12 @@ BDEPEND="${PYTHON_DEPS}
sys-devel/llvm:14
clang? (
sys-devel/lld:14
+ virtual/rust:0/llvm-14
pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
)
)
)
- || (
- virtual/rust:0/llvm-15
- virtual/rust:0/llvm-14
- )
+ !clang? ( virtual/rust )
app-arch/unzip
app-arch/zip
>=dev-util/cbindgen-0.24.3
@@ -208,6 +207,11 @@ llvm_check_deps() {
return 1
fi
+ if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
+ einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+ return 1
+ fi
+
if use pgo ; then
if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing! Cannot use LLVM slot ${LLVM_SLOT} ... Please try emerge -1av =sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* with profile use flag on!" >&2
@@ -397,20 +401,6 @@ pkg_setup() {
check-reqs_pkg_setup
- # Attempt to force a specific llvm/clang/lld with multiple llvm toolchain slots installed.
- local LLVM_USE_SLOT=${LLVM_MAX_SLOT}
- if $(has_version "virtual/rust:0/llvm-${LLVM_USE_SLOT}"); then
- :
- else
- ((LLVM_USE_SLOT=LLVM_USE_SLOT-1))
- if $(has_version "virtual/rust:0/llvm-${LLVM_USE_SLOT}"); then
- :
- else
- die "Couldn't find virtual/rust:0/llvm-${LLVM_MAX_SLOT} or virtual/rust:0/llvm-${LLVM_USE_SLOT}. Check your virtual/rust installation."
- fi
- fi
-
- local LLVM_MAX_SLOT=${LLVM_USE_SLOT}
llvm_pkg_setup
if use clang && use lto ; then