[gentoo-commits] repo/gentoo:master commit in: eclass/

[WANG Xuerui]

commit:     f66c64d25bc04fc2ef3bd3cba6a8fbc48f42be9f
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 07:31:50 2023 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Mon Aug 28 06:51:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f66c64d2

rust-toolchain.eclass: exclude mips from SRC_URI for versions >= 1.72.0

Upstream dropped the mips*-linux-gnu* targets to Tier 3, so until the
situation is resolved there will not be prebuilt binaries from upstream.

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 eclass/rust-toolchain.eclass | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

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
 }