| 1 |
commit: f4cd97ac2e4322f75738a9edb03fe216554121a9 |
| 2 |
Author: Marcus Comstedt <marcus <AT> mc <DOT> pp <DOT> se> |
| 3 |
AuthorDate: Sun Oct 28 21:23:01 2018 +0000 |
| 4 |
Commit: Dirkjan Ochtman <djc <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 28 21:24:07 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4cd97ac |
| 7 |
|
| 8 |
dev-lang/rust: make better use of rust-toolchain.eclass |
| 9 |
|
| 10 |
Signed-off-by: Marcus Comstedt <marcus <AT> mc.pp.se> |
| 11 |
Signed-off-by: Dirkjan Ochtman <djc <AT> gentoo.org> |
| 12 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
| 13 |
|
| 14 |
dev-lang/rust/rust-1.29.2.ebuild | 14 ++------------ |
| 15 |
1 file changed, 2 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-lang/rust/rust-1.29.2.ebuild b/dev-lang/rust/rust-1.29.2.ebuild |
| 18 |
index b1d1b8dd282..a78fda48444 100644 |
| 19 |
--- a/dev-lang/rust/rust-1.29.2.ebuild |
| 20 |
+++ b/dev-lang/rust/rust-1.29.2.ebuild |
| 21 |
@@ -21,14 +21,7 @@ else |
| 22 |
KEYWORDS="~amd64 ~arm64 ~x86" |
| 23 |
fi |
| 24 |
|
| 25 |
-CHOST_amd64=x86_64-unknown-linux-gnu |
| 26 |
-CHOST_x86=i686-unknown-linux-gnu |
| 27 |
-CHOST_arm64=aarch64-unknown-linux-gnu |
| 28 |
- |
| 29 |
RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0" |
| 30 |
-RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}" |
| 31 |
-RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}" |
| 32 |
-RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}" |
| 33 |
|
| 34 |
CARGO_DEPEND_VERSION="0.$(($(ver_cut 2) + 1)).0" |
| 35 |
|
| 36 |
@@ -83,8 +76,7 @@ toml_usex() { |
| 37 |
src_prepare() { |
| 38 |
local rust_stage0_root="${WORKDIR}"/rust-stage0 |
| 39 |
|
| 40 |
- local rust_stage0_name="RUST_STAGE0_${ARCH}" |
| 41 |
- local rust_stage0="${!rust_stage0_name}" |
| 42 |
+ local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)" |
| 43 |
|
| 44 |
"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die |
| 45 |
|
| 46 |
@@ -96,8 +88,7 @@ src_configure() { |
| 47 |
|
| 48 |
# Collect rust target names to compile standard libs for all ABIs. |
| 49 |
for v in $(multilib_get_enabled_abi_pairs); do |
| 50 |
- rust_target_name="CHOST_${v##*.}" |
| 51 |
- rust_targets="${rust_targets},\"${!rust_target_name}\"" |
| 52 |
+ rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\"" |
| 53 |
done |
| 54 |
if use wasm; then |
| 55 |
rust_targets="${rust_targets},\"wasm32-unknown-unknown\"" |
| 56 |
@@ -124,7 +115,6 @@ src_configure() { |
| 57 |
|
| 58 |
local rust_stage0_root="${WORKDIR}"/rust-stage0 |
| 59 |
|
| 60 |
- rust_target_name="CHOST_${ARCH}" |
| 61 |
rust_target="$(rust_abi)" |
| 62 |
|
| 63 |
cat <<- EOF > "${S}"/config.toml |
Archives