diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-08-28 10:02:11 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-08-28 10:02:11 +0100 |
| commit | 9967860c0cd26c0940ee4b9ab6698e00e5b1260a (patch) | |
| tree | 000be053853792419070a7d8f64379ec7ca7bc8b /eclass | |
| parent | efc1a67ef36757bc76eb899ec03802086adda461 (diff) | |
gentoo auto-resync : 28:08:2023 - 10:02:11
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 38513 -> 38510 bytes | |||
| -rw-r--r-- | eclass/rust-toolchain.eclass | 28 |
2 files changed, 17 insertions, 11 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 5ef5f6e317fb..2c82f6abf4b3 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass index f4451f743596..5824a48734f9 100644 --- a/eclass/rust-toolchain.eclass +++ b/eclass/rust-toolchain.eclass @@ -122,16 +122,6 @@ rust_all_arch_uris() elibc_glibc? ( $(rust_arch_uri aarch64-unknown-linux-gnu "$@") ) elibc_musl? ( $(rust_arch_uri aarch64-unknown-linux-musl "$@") ) ) - mips? ( - abi_mips_o32? ( - big-endian? ( $(rust_arch_uri mips-unknown-linux-gnu "$@") ) - !big-endian? ( $(rust_arch_uri mipsel-unknown-linux-gnu "$@") ) - ) - abi_mips_n64? ( - big-endian? ( $(rust_arch_uri mips64-unknown-linux-gnuabi64 "$@") ) - !big-endian? ( $(rust_arch_uri mips64el-unknown-linux-gnuabi64 "$@") ) - ) - ) ppc? ( $(rust_arch_uri powerpc-unknown-linux-gnu "$@") ) ppc64? ( big-endian? ( $(rust_arch_uri powerpc64-unknown-linux-gnu "$@") ) @@ -145,7 +135,23 @@ rust_all_arch_uris() # NOTE: Merge this into the block above after every <1.71.0 version is # gone from tree. local arg_version="${1##*-}" - if ver_test "${arg_version:-$PV}" -ge 1.71.0; then + arg_version="${arg_version:-$PV}" + if ver_test "${arg_version}" -ge 1.71.0; then echo "loong? ( $(rust_arch_uri loongarch64-unknown-linux-gnu "$@") )" fi + + # until https://github.com/rust-lang/rust/pull/113274 is resolved, there + # will not be upstream-built mips artifacts + if ver_test "${arg_version}" -lt 1.72.0; then + echo "mips? ( + abi_mips_o32? ( + big-endian? ( $(rust_arch_uri mips-unknown-linux-gnu "$@") ) + !big-endian? ( $(rust_arch_uri mipsel-unknown-linux-gnu "$@") ) + ) + abi_mips_n64? ( + big-endian? ( $(rust_arch_uri mips64-unknown-linux-gnuabi64 "$@") ) + !big-endian? ( $(rust_arch_uri mips64el-unknown-linux-gnuabi64 "$@") ) + ) + )" + fi } |