summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorArthur Zamarin <arthurzam@gentoo.org>2024-08-15 20:56:32 +0300
committerArthur Zamarin <arthurzam@gentoo.org>2024-08-16 08:55:35 +0300
commit1533b604e787b2dfdced75dd5b92b50755f54fb7 (patch)
tree93887d503cf8fbaacfad9be7deabeeaf6cd2b804 /eclass
parentdev-lang/rust-bin: add tarball for ppc64{be,le} musl (diff)
downloadgentoo-1533b604e787b2dfdced75dd5b92b50755f54fb7.tar.gz
gentoo-1533b604e787b2dfdced75dd5b92b50755f54fb7.tar.bz2
gentoo-1533b604e787b2dfdced75dd5b92b50755f54fb7.zip
rust-toolchain.eclass: hide glibc bins behind elibc_glibc?
I'm starting to add various bootstrap binaries for musl, so might as well protect all downloads of glibc only behind "elibc_glibc?" to be safe just in case. Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/rust-toolchain.eclass20
1 files changed, 9 insertions, 11 deletions
diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass
index 469479b849b3..6ad5c811f6c0 100644
--- a/eclass/rust-toolchain.eclass
+++ b/eclass/rust-toolchain.eclass
@@ -91,29 +91,27 @@ rust_arch_uri() {
rust_all_arch_uris()
{
echo "
- abi_x86_32? ( $(rust_arch_uri i686-unknown-linux-gnu "$@") )
+ abi_x86_32? ( elibc_glibc? ( $(rust_arch_uri i686-unknown-linux-gnu "$@") ) )
abi_x86_64? (
elibc_glibc? ( $(rust_arch_uri x86_64-unknown-linux-gnu "$@") )
elibc_musl? ( $(rust_arch_uri x86_64-unknown-linux-musl "$@") )
)
- arm? (
+ arm? ( elibc_glibc? (
$(rust_arch_uri arm-unknown-linux-gnueabi "$@")
$(rust_arch_uri arm-unknown-linux-gnueabihf "$@")
$(rust_arch_uri armv7-unknown-linux-gnueabihf "$@")
- )
+ ) )
arm64? (
elibc_glibc? ( $(rust_arch_uri aarch64-unknown-linux-gnu "$@") )
elibc_musl? ( $(rust_arch_uri aarch64-unknown-linux-musl "$@") )
)
- ppc? ( $(rust_arch_uri powerpc-unknown-linux-gnu "$@") )
+ ppc? ( elibc_glibc? ( $(rust_arch_uri powerpc-unknown-linux-gnu "$@") ) )
ppc64? (
- big-endian? ( $(rust_arch_uri powerpc64-unknown-linux-gnu "$@") )
- !big-endian? ( $(rust_arch_uri powerpc64le-unknown-linux-gnu "$@") )
- )
- riscv? (
- elibc_glibc? ( $(rust_arch_uri riscv64gc-unknown-linux-gnu "$@") )
+ big-endian? ( elibc_glibc? ( $(rust_arch_uri powerpc64-unknown-linux-gnu "$@") ) )
+ !big-endian? ( elibc_glibc? ( $(rust_arch_uri powerpc64le-unknown-linux-gnu "$@") ) )
)
- s390? ( $(rust_arch_uri s390x-unknown-linux-gnu "$@") )
+ riscv? ( elibc_glibc? ( $(rust_arch_uri riscv64gc-unknown-linux-gnu "$@") ) )
+ s390? ( elibc_glibc? ( $(rust_arch_uri s390x-unknown-linux-gnu "$@") ) )
"
# Upstream did not gain support for loong until v1.71.0.
@@ -122,7 +120,7 @@ rust_all_arch_uris()
local arg_version="${1##*-}"
arg_version="${arg_version:-$PV}"
if ver_test "${arg_version}" -ge 1.71.0; then
- echo "loong? ( $(rust_arch_uri loongarch64-unknown-linux-gnu "$@") )"
+ echo "loong? ( elibc_glibc? ( $(rust_arch_uri loongarch64-unknown-linux-gnu "$@") ) )"
fi
# until https://github.com/rust-lang/rust/pull/113274 is resolved, there