diff options
author | V3n3RiX <venerix@koprulu.sector> | 2025-04-14 08:45:05 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2025-04-14 08:45:05 +0100 |
commit | 4e995247a9a9d45f0b265ab9120c6d31c0a1f0d9 (patch) | |
tree | b8330005bca4333e931cf74629b98e71aa5e608b /eclass | |
parent | ca533b9b46b871263ead04dcb28165df09a3f282 (diff) |
gentoo auto-resync : 14:04:2025 - 08:45:05
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/Manifest.gz | bin | 40341 -> 40345 bytes | |||
-rw-r--r-- | eclass/llvm-r2.eclass | 4 | ||||
-rw-r--r-- | eclass/rust.eclass | 4 | ||||
-rw-r--r-- | eclass/toolchain.eclass | 5 |
4 files changed, 8 insertions, 5 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 68b3459306f4..d402575513ab 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/llvm-r2.eclass b/eclass/llvm-r2.eclass index 4dda9aedc7c6..5370e5dbd8d5 100644 --- a/eclass/llvm-r2.eclass +++ b/eclass/llvm-r2.eclass @@ -1,4 +1,4 @@ -# Copyright 2024 Gentoo Authors +# Copyright 2024-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: llvm-r2.eclass @@ -54,7 +54,7 @@ esac if [[ -z ${_LLVM_R2_ECLASS} ]]; then _LLVM_R2_ECLASS=1 -inherit llvm-utils +inherit llvm-utils multilib # == internal control knobs == diff --git a/eclass/rust.eclass b/eclass/rust.eclass index ae590284db33..a9ccfed4cf8f 100644 --- a/eclass/rust.eclass +++ b/eclass/rust.eclass @@ -68,7 +68,7 @@ fi # Definitive list of Rust slots and the associated LLVM slot, newest first. declare -A -g -r _RUST_LLVM_MAP=( ["9999"]=20 - ["1.86"]=19 + ["1.86.0"]=19 ["1.85.1"]=19 ["1.85.0"]=19 ["1.84.1"]=19 @@ -94,7 +94,7 @@ declare -A -g -r _RUST_LLVM_MAP=( # this array is used to store the Rust slots in a more convenient order for iteration. declare -a -g -r _RUST_SLOTS_ORDERED=( "9999" - "1.86" + "1.86.0" "1.85.1" "1.85.0" "1.84.1" diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 273a2b9f92c9..b6cc4df5364a 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1921,10 +1921,13 @@ toolchain_src_configure() { # respect USE=graphite here in case the user passes some # graphite flags rather than try strip them out. $(use_with graphite isl) - $(use_with zstd) --with-system-zlib ) + if tc_has_feature zstd ; then + confgcc_jit+=( $(use_with zstd) ) + fi + if tc_version_is_at_least 15.0.0_pre20241124 ${PV} ; then confgcc_jit+=( $(use_enable libgdiagnostics) ) fi |