diff options
| author | Joonas Niilola <juippis@gentoo.org> | 2022-11-16 14:41:13 +0200 |
|---|---|---|
| committer | Joonas Niilola <juippis@gentoo.org> | 2022-11-16 14:53:46 +0200 |
| commit | af5e1a7a79708bab02b0b9ec9ca5c11fa3e68b65 (patch) | |
| tree | 886500786d32d25fee67985c422899bd005c4a90 | |
| parent | adc5cd98b938327eec817d3847c137970ec39498 (diff) | |
| download | gentoo-af5e1a7a79708bab02b0b9ec9ca5c11fa3e68b65.tar.gz gentoo-af5e1a7a79708bab02b0b9ec9ca5c11fa3e68b65.tar.bz2 gentoo-af5e1a7a79708bab02b0b9ec9ca5c11fa3e68b65.zip | |
www-client/firefox: add dirty hack to 102esr for llvm stable/unstable
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
| -rw-r--r-- | www-client/firefox/firefox-102.5.0.ebuild | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/www-client/firefox/firefox-102.5.0.ebuild b/www-client/firefox/firefox-102.5.0.ebuild index 61ed1435716f..03abcbf6fefe 100644 --- a/www-client/firefox/firefox-102.5.0.ebuild +++ b/www-client/firefox/firefox-102.5.0.ebuild @@ -209,19 +209,19 @@ fi llvm_check_deps() { if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then - einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 + einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ... Please try emerge -1av sys-devel/clang:${LLVM_SLOT}" >&2 return 1 fi if use clang ; then if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then - einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 + einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ... Please try emerge -1av sys-devel/lld:${LLVM_SLOT}" >&2 return 1 fi if use pgo ; then - if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then - einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 + 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 return 1 fi fi @@ -444,6 +444,20 @@ 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 |