[prev in list] [next in list] [prev in thread] [next in thread]
List: gentoo-dev
Subject: [gentoo-dev] [PATCH 3/3] rust-toolchain.eclass: qualify applicable rust_arch_uris with ABI and endia
From: WANG Xuerui <xen0n () gentoo ! org>
Date: 2023-05-31 12:59:41
Message-ID: 20230531125941.2767171-4-xen0n () gentoo ! org
[Download RAW message or body]
For less downloading client-side, as it is likely that only one package
in each covered group would work on a given system.
Closes: https://github.com/gentoo/gentoo/pull/31241
Signed-off-by: WANG Xuerui <xen0n@gentoo.org>
---
dev-lang/rust-bin/rust-bin-1.65.0-r1.ebuild | 2 +-
dev-lang/rust-bin/rust-bin-1.66.1-r1.ebuild | 2 +-
dev-lang/rust-bin/rust-bin-1.67.1-r2.ebuild | 2 +-
dev-lang/rust-bin/rust-bin-1.68.1.ebuild | 2 +-
dev-lang/rust-bin/rust-bin-1.68.2-r1.ebuild | 2 +-
dev-lang/rust-bin/rust-bin-1.69.0.ebuild | 2 +-
dev-lang/rust/rust-1.65.0.ebuild | 2 +-
dev-lang/rust/rust-1.66.1.ebuild | 2 +-
dev-lang/rust/rust-1.67.1.ebuild | 2 +-
dev-lang/rust/rust-1.68.1.ebuild | 2 +-
dev-lang/rust/rust-1.68.2.ebuild | 2 +-
dev-lang/rust/rust-1.69.0-r1.ebuild | 2 +-
eclass/rust-toolchain.eclass | 16 ++++++++++------
13 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/dev-lang/rust-bin/rust-bin-1.65.0-r1.ebuild \
b/dev-lang/rust-bin/rust-bin-1.65.0-r1.ebuild index 217681fdca9e..6dde1cf31349 100644
--- a/dev-lang/rust-bin/rust-bin-1.65.0-r1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.65.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI+=" sparc? ( \
${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar. LICENSE="|| ( MIT \
Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" SLOT="stable"
KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt"
+IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src \
rustfmt"
DEPEND=""
diff --git a/dev-lang/rust-bin/rust-bin-1.66.1-r1.ebuild \
b/dev-lang/rust-bin/rust-bin-1.66.1-r1.ebuild index 4c965e1f5dd4..f9765ffc184f 100644
--- a/dev-lang/rust-bin/rust-bin-1.66.1-r1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.66.1-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI+=" sparc? ( \
${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar. LICENSE="|| ( MIT \
Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA" SLOT="stable"
KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt"
+IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src \
rustfmt"
DEPEND=""
diff --git a/dev-lang/rust-bin/rust-bin-1.67.1-r2.ebuild \
b/dev-lang/rust-bin/rust-bin-1.67.1-r2.ebuild index c8ce92fc1251..d6a0726bbef4 100644
--- a/dev-lang/rust-bin/rust-bin-1.67.1-r2.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.67.1-r2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})
LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA"
SLOT="stable"
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
-IUSE="clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt"
+IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src \
rustfmt"
DEPEND=""
diff --git a/dev-lang/rust-bin/rust-bin-1.68.1.ebuild \
b/dev-lang/rust-bin/rust-bin-1.68.1.ebuild index dd3c4559ee18..73b3c80c1c16 100644
--- a/dev-lang/rust-bin/rust-bin-1.68.1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.68.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})
LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA"
SLOT="stable"
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
-IUSE="clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt"
+IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src \
rustfmt"
DEPEND=""
diff --git a/dev-lang/rust-bin/rust-bin-1.68.2-r1.ebuild \
b/dev-lang/rust-bin/rust-bin-1.68.2-r1.ebuild index efd643da0fd7..84e6effba07c 100644
--- a/dev-lang/rust-bin/rust-bin-1.68.2-r1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.68.2-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})
LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA"
SLOT="stable"
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
-IUSE="clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt"
+IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src \
rustfmt"
DEPEND=""
diff --git a/dev-lang/rust-bin/rust-bin-1.69.0.ebuild \
b/dev-lang/rust-bin/rust-bin-1.69.0.ebuild index 10ed7b6cb1f4..71bcc04ada4c 100644
--- a/dev-lang/rust-bin/rust-bin-1.69.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.69.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})
LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA"
SLOT="stable"
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
-IUSE="clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt"
+IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src \
rustfmt"
DEPEND=""
diff --git a/dev-lang/rust/rust-1.65.0.ebuild b/dev-lang/rust/rust-1.65.0.ebuild
index bb793aa16865..c3fe7cbd2f01 100644
--- a/dev-lang/rust/rust-1.65.0.ebuild
+++ b/dev-lang/rust/rust-1.65.0.ebuild
@@ -41,7 +41,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-IUSE="clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly \
parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap \
system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" +IUSE="big-endian clippy \
cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly parallel-compiler \
profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm \
${ALL_LLVM_TARGETS[*]}"
# Please keep the LLVM dependency block separate. Since LLVM is slotted,
# we need to *really* make sure we're not pulling more than one slot
diff --git a/dev-lang/rust/rust-1.66.1.ebuild b/dev-lang/rust/rust-1.66.1.ebuild
index 85a895e94dc2..dcb7d993909c 100644
--- a/dev-lang/rust/rust-1.66.1.ebuild
+++ b/dev-lang/rust/rust-1.66.1.ebuild
@@ -41,7 +41,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA"
-IUSE="clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly \
parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap \
system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" +IUSE="big-endian clippy \
cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly parallel-compiler \
profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm \
${ALL_LLVM_TARGETS[*]}"
# Please keep the LLVM dependency block separate. Since LLVM is slotted,
# we need to *really* make sure we're not pulling more than one slot
diff --git a/dev-lang/rust/rust-1.67.1.ebuild b/dev-lang/rust/rust-1.67.1.ebuild
index 5c51929f95da..8e1fe65ba1ac 100644
--- a/dev-lang/rust/rust-1.67.1.ebuild
+++ b/dev-lang/rust/rust-1.67.1.ebuild
@@ -41,7 +41,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA"
-IUSE="clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly \
parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap \
system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" +IUSE="big-endian clippy \
cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly parallel-compiler \
profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm \
${ALL_LLVM_TARGETS[*]}"
# Please keep the LLVM dependency block separate. Since LLVM is slotted,
# we need to *really* make sure we're not pulling more than one slot
diff --git a/dev-lang/rust/rust-1.68.1.ebuild b/dev-lang/rust/rust-1.68.1.ebuild
index 4f904c718106..b1a1b6277f93 100644
--- a/dev-lang/rust/rust-1.68.1.ebuild
+++ b/dev-lang/rust/rust-1.68.1.ebuild
@@ -41,7 +41,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA"
-IUSE="clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly \
parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap \
system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" +IUSE="big-endian clippy \
cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly parallel-compiler \
profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm \
${ALL_LLVM_TARGETS[*]}"
# Please keep the LLVM dependency block separate. Since LLVM is slotted,
# we need to *really* make sure we're not pulling more than one slot
diff --git a/dev-lang/rust/rust-1.68.2.ebuild b/dev-lang/rust/rust-1.68.2.ebuild
index 4f904c718106..b1a1b6277f93 100644
--- a/dev-lang/rust/rust-1.68.2.ebuild
+++ b/dev-lang/rust/rust-1.68.2.ebuild
@@ -41,7 +41,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA"
-IUSE="clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly \
parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap \
system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" +IUSE="big-endian clippy \
cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly parallel-compiler \
profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm \
${ALL_LLVM_TARGETS[*]}"
# Please keep the LLVM dependency block separate. Since LLVM is slotted,
# we need to *really* make sure we're not pulling more than one slot
diff --git a/dev-lang/rust/rust-1.69.0-r1.ebuild \
b/dev-lang/rust/rust-1.69.0-r1.ebuild index 1dd71ce737db..559f56ec676c 100644
--- a/dev-lang/rust/rust-1.69.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.69.0-r1.ebuild
@@ -41,7 +41,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA"
-IUSE="clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly \
parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap \
system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" +IUSE="big-endian clippy \
cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly parallel-compiler \
profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm \
${ALL_LLVM_TARGETS[*]}"
# Please keep the LLVM dependency block separate. Since LLVM is slotted,
# we need to *really* make sure we're not pulling more than one slot
diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass
index c9c0886009a2..0dcafdf9b335 100644
--- a/eclass/rust-toolchain.eclass
+++ b/eclass/rust-toolchain.eclass
@@ -122,15 +122,19 @@ rust_all_arch_uris()
elibc_musl? ( $(rust_arch_uri aarch64-unknown-linux-musl "$@") )
)
mips? (
- $(rust_arch_uri mips-unknown-linux-gnu "$@")
- $(rust_arch_uri mipsel-unknown-linux-gnu "$@")
- $(rust_arch_uri mips64-unknown-linux-gnuabi64 "$@")
- $(rust_arch_uri mips64el-unknown-linux-gnuabi64 "$@")
+ 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? (
- $(rust_arch_uri powerpc64-unknown-linux-gnu "$@")
- $(rust_arch_uri powerpc64le-unknown-linux-gnu "$@")
+ big-endian? ( $(rust_arch_uri powerpc64-unknown-linux-gnu "$@") )
+ !big-endian? ( $(rust_arch_uri powerpc64le-unknown-linux-gnu "$@") )
)
riscv? ( $(rust_arch_uri riscv64gc-unknown-linux-gnu "$@") )
s390? ( $(rust_arch_uri s390x-unknown-linux-gnu "$@") )
--
2.40.0
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic