commit: d2a4a993d6a35c1494d28b62d8b2bfd3544a987f
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 06:03:25 2025 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 11:13:15 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2a4a993
rust-toolchain.eclass: simplify `rust_all_arch_uris`
The `mips` logic has been moved into the one ebuild that it impacts,
and that ebuild is only required for one package - we'll try to
remove it from the tree soon.
Merge `loong` into `rust_all_arch_uris()` output unconditionally;
the check is now superfluous - all pre-1.71.0 rust versions
are out of the tree.
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
eclass/rust-toolchain.eclass | 27 ++-------------------------
1 file changed, 2 insertions(+), 25 deletions(-)
diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass
index 89bca88b9e6b..2d9c56b4d6b6 100644
--- a/eclass/rust-toolchain.eclass
+++ b/eclass/rust-toolchain.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: rust-toolchain.eclass
@@ -113,29 +113,6 @@ rust_all_arch_uris()
)
riscv? ( elibc_glibc? ( $(rust_arch_uri riscv64gc-unknown-linux-gnu
"$@") ) )
s390? ( elibc_glibc? ( $(rust_arch_uri s390x-unknown-linux-gnu
"$@") ) )
+ loong? ( elibc_glibc? ( $(rust_arch_uri loongarch64-unknown-linux-gnu
"$@") ) )
"
-
- # Upstream did not gain support for loong until v1.71.0.
- # NOTE: Merge this into the block above after every <1.71.0 version is
- # gone from tree.
- local arg_version="${1##*-}"
- arg_version="${arg_version:-$PV}"
- if ver_test "${arg_version}" -ge 1.71.0; then
- echo "loong? ( elibc_glibc? ( $(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
}
