diff options
Diffstat (limited to 'dev-lang/rust')
| -rw-r--r-- | dev-lang/rust/Manifest | 2 | ||||
| -rw-r--r-- | dev-lang/rust/rust-1.84.0-r1.ebuild | 28 |
2 files changed, 15 insertions, 15 deletions
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest index e1e31255b829..3d5d9296335a 100644 --- a/dev-lang/rust/Manifest +++ b/dev-lang/rust/Manifest @@ -65,7 +65,7 @@ EBUILD rust-1.80.1-r101.ebuild 24012 BLAKE2B 5a8cdfcd1fb5553e6dcaaa98a5d817dec02 EBUILD rust-1.81.0-r101.ebuild 24209 BLAKE2B 426b068e2682c88340de00e42891cb5f75e5a41dd6c902168946614bbcebb6f394872002014f2ff8fcf6c908d1d59b50fdf44bf3ecfed5da9608746d18af6dbd SHA512 461f02f3b3483cc9034ac0eb0f1be24ccf05919af378bcccb81fa06ac51bc37df0cd9d71b7c7117b326f228017bbd9b9cac09f2a02ab1c449510980c96516843 EBUILD rust-1.82.0-r102.ebuild 24404 BLAKE2B 11d53de161ab3d656724c8fb4f32050abd7e4322dcc1046702f8b00fcf19fbe7ce7478fe94deb29c67c3a61bde92842aabe62e14005a0eec88cfee8b6647efdc SHA512 88d9e75bd72804b385ef651d268171e3dda6075e84c7591e7295089efe0ee864cc36ac98bb6c193eb17b2ea3e161972ecfe05f24eb03cbc943968dedefed1f17 EBUILD rust-1.83.0-r2.ebuild 23637 BLAKE2B 4f015de1734b0ea942b0c6e3ea72815a5cb9608fd4e9bb59d81952f749cbda6e4bba700d503c5e5aa6a39cef72884dfac29c15eacee5b31118511bfefa851402 SHA512 c20809d2eceff7d7ed764c8082013fa7687ee2644eb6c6b10de220d62ed6fca85665ded9173c17507a933ada04ea40f2a999ebd9c3252d4ef484eeb674dfe8d0 -EBUILD rust-1.84.0-r1.ebuild 22123 BLAKE2B 4d78d8ac1b95f17059b315b1f54349a988e69817ebd3d9b683f5fb29e2f2eb0f631fff2fa4bff69b796bde5285d70f67dcb9ef09e017c60858d39adc65b9c69d SHA512 899d86f39a7015be8de1352efaa8baf8f36daf6b3dd92d53cdfeadaf9a2a6e6bc9c3bd5029b7da6fb32f110b78f77057428765dffc582241d98fab9a0d3417f4 +EBUILD rust-1.84.0-r1.ebuild 22248 BLAKE2B e10d56d1b712b1ede57ae72d2f97e29e7084721019d1541c4454230ffaaa0116117b5b6f7ffc393d09f4e6e03cf96ba9e73583b84f4cdc371d5328f2dc14ee04 SHA512 deacba9fc98a02d9ea6d8c50fe2ef5099e60a69bad562421adfac1810cbfaae95dd7cdbcf2ab23c8f89d3321b074904a4279469825b22856fded0d0f6bacadc9 EBUILD rust-1.84.1-r1.ebuild 22226 BLAKE2B 3bfd5379730cec0805baabb40b4d6dd018ab30cd47b597a8a8e21be3d920c898c6c747224880f6c8017e2e1f325a56551162d96983900fa15b0a6832f8c7594b SHA512 b5ec38df4a093732e0c6bb6bef6c69fa8e92f133bcd76055105c4b503b4b2a94664a2e1a993a4ffd5c405183b1ad55a97f184ad6e9783a22712946ef68b0e9d0 EBUILD rust-1.85.0-r1.ebuild 25359 BLAKE2B 47f020237a54c20c997ee279dbec95adf7b03c36624c8fc5ffc93a5e40525a57e0edc2ec0cf4ca30aa71560784bec64237694b58060e91897a7ca9e50fd8b75e SHA512 d6e901e241114911d80ecf9f04598b18e81dec53d12c50ae77afdab4c79998dcb92ecd463448c4415a1039f0f8bc61198f56d18ae69d0d34436b82fd1433edaf EBUILD rust-1.85.0.ebuild 25310 BLAKE2B f58fed6c72cd54bcc608695aa67554ab8def3887408f7a7b17ad5e36a7fb3923f196f5b072e788edef11ab5ea7dc8a7b1301799ca29db44649615af38d686844 SHA512 2d3f1f627a4aa666034dff412db54d3e75854769c9bdb04827b306cef8a309200befcf547b12e66b25b6cb9c0b0f7a385a98b92e8ad7262cc2b61b1f22529f8b diff --git a/dev-lang/rust/rust-1.84.0-r1.ebuild b/dev-lang/rust/rust-1.84.0-r1.ebuild index 4414a294a3d4..298a05164946 100644 --- a/dev-lang/rust/rust-1.84.0-r1.ebuild +++ b/dev-lang/rust/rust-1.84.0-r1.ebuild @@ -40,8 +40,11 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?} # https://github.com/rust-lang/llvm-project/blob/rustc-1.84.0/llvm/CMakeLists.txt -_ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa ) -ALL_LLVM_EXPERIMENTAL_TARGETS=( ) +_ALL_RUST_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa ) +declare -A ALL_RUST_EXPERIMENTAL_TARGETS +for _x in "${_ALL_RUST_EXPERIMENTAL_TARGETS[@]}"; do + ALL_RUST_EXPERIMENTAL_TARGETS["llvm_targets_${_x}"]=0 +done LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" @@ -52,12 +55,9 @@ LLVM_DEPEND=() # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation for _x in "${ALL_LLVM_TARGETS[@]}"; do LLVM_DEPEND+=( " ${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" ) - for _xx in "${_ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do - if [[ "${_xx}" == "${_x}" ]] ; then - ALL_LLVM_EXPERIMENTAL_TARGETS+=( ${_x} ) - break - fi - done + if [[ -v ALL_RUST_EXPERIMENTAL_TARGETS["${_x}"] ]] ; then + ALL_RUST_EXPERIMENTAL_TARGETS["${_x}"]=1 + fi done LLVM_DEPEND+=( " wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" ) LLVM_DEPEND+=( " $(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" ) @@ -279,13 +279,13 @@ src_configure() { rust_build="$(rust_abi "${CBUILD}")" rust_host="$(rust_abi "${CHOST}")" - LLVM_EXPERIMENTAL_TARGETS=() - for _x in "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do - if use llvm_targets_${_x} ; then - LLVM_EXPERIMENTAL_TARGETS+=( ${_x} ) + RUST_EXPERIMENTAL_TARGETS=() + for _x in "${!ALL_RUST_EXPERIMENTAL_TARGETS[@]}"; do + if [[ ${ALL_RUST_EXPERIMENTAL_TARGETS[${_x}]} == 1 ]] && use ${_x} ; then + RUST_EXPERIMENTAL_TARGETS+=( ${_x#llvm_targets_} ) fi done - LLVM_EXPERIMENTAL_TARGETS=${LLVM_EXPERIMENTAL_TARGETS[@]} + RUST_EXPERIMENTAL_TARGETS=${RUST_EXPERIMENTAL_TARGETS[@]} local cm_btype="$(usex debug DEBUG RELEASE)" cat <<- _EOF_ > "${S}"/config.toml @@ -298,7 +298,7 @@ src_configure() { assertions = $(toml_usex debug) ninja = true targets = "${LLVM_TARGETS// /;}" - experimental-targets = "${LLVM_EXPERIMENTAL_TARGETS// /;}" + experimental-targets = "${RUST_EXPERIMENTAL_TARGETS// /;}" link-shared = $(toml_usex system-llvm) $(if is_libcxx_linked; then # https://bugs.gentoo.org/732632 |