diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-11-17 12:56:42 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-11-17 12:56:42 +0000 |
| commit | 34fb4543abc1dae6f74171ad8dc80fa64636a941 (patch) | |
| tree | 5923cd4dc2a560dba9b618db67713ae10cf92f75 /www-client/firefox/firefox-102.5.0.ebuild | |
| parent | 1536d928ae095e00db8775fecca580c10adc0af8 (diff) | |
gentoo auto-resync : 17:11:2022 - 12:56:42
Diffstat (limited to 'www-client/firefox/firefox-102.5.0.ebuild')
| -rw-r--r-- | www-client/firefox/firefox-102.5.0.ebuild | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/www-client/firefox/firefox-102.5.0.ebuild b/www-client/firefox/firefox-102.5.0.ebuild index 03abcbf6fefe..a147b671f476 100644 --- a/www-client/firefox/firefox-102.5.0.ebuild +++ b/www-client/firefox/firefox-102.5.0.ebuild @@ -89,6 +89,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] ) ) ) @@ -97,19 +98,17 @@ 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 - ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.24.3 net-libs/nodejs virtual/pkgconfig + !clang? ( virtual/rust ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 )" @@ -219,6 +218,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 @@ -444,20 +448,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 |