From f65628136faa35d0c4d3b5e7332275c7b35fcd96 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Nov 2018 08:36:22 +0000 Subject: gentoo resync : 03.11.2018 --- dev-lang/rust/Manifest | 2 +- dev-lang/rust/rust-1.29.2.ebuild | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) (limited to 'dev-lang/rust') diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest index 072e11492805..898cc405c36f 100644 --- a/dev-lang/rust/Manifest +++ b/dev-lang/rust/Manifest @@ -15,5 +15,5 @@ DIST rust-1.28.0-x86_64-unknown-linux-gnu.tar.xz 134120432 BLAKE2B 56fb79a98659d DIST rustc-1.29.1-src.tar.xz 61937676 BLAKE2B 6a60249538e1ec62471f4d0e3fc31c0a648433aa6f85ca7341657ea07772e338eb92a629941685808f4b80e84cb025d78aee9d0d6fa71c6635a1647c61bca9bc SHA512 1ded651b4c460e11e5e44c26de88a80fb13c2000097de2ee1e5af89638e12a7e8f43dd756689d4cc4fad45c52d4d43a3c70dd6a3ae550735b9dad5f8defea6a7 DIST rustc-1.29.2-src.tar.xz 61888912 BLAKE2B f59b0bf45caa6f6136f92ffbaa612bbc6a340c8694ec69d75aadace9180c36753f985641915524388b52cc108f8f5b71840ee3a6c0b1fcff6decb61d2d8a161e SHA512 d8fa9501764348ace8f60f2069bcd016925abe56c8bbc2b87fb52ff796e4bc7284c1fccbb1671416437bb82fde7d9240eeae875d6099914e27e75cfe050e2d38 EBUILD rust-1.29.1.ebuild 7965 BLAKE2B f84b3e11c73b20abf236f457435c56fc2ef160cbd174bb048a24c307a6627680ce266cdd276974a569d0ba715c13f0e1e2e36c2fef3d1600bc4eefefdbc0e3da SHA512 23d46b6feff4016ad6b9e508c58a7d41dfe1568b45b6332efd56c08100d8790f40509cc16b0aed699a839b47ae6bdba700b428c74ed7aa6bd03d8927d6af7233 -EBUILD rust-1.29.2.ebuild 7870 BLAKE2B a1c83338300b43ce54f1fbf8a28999a7574121c1eae70ddc7cdfc2587616a255cf83b26bb17a70c94a92d9a651b242e995878b6fbf8a89d4de9131cb202bd0da SHA512 08bfa1f80fa8845a9886f85d3280d0ba000a4c8460ea79148f85a9f67a90fa42a597399ce2a219fd06685c295aca7816008a5d58684c34a36e8e3fd19b3be030 +EBUILD rust-1.29.2.ebuild 7496 BLAKE2B a51ef2ee6137a2e8f7fb700614af173b6f6ccafbf37cff705f9188a74009d56a0dc3333b1f3b419bd1fdf9b8aa5c59168d23b75b36efd2864200e0bc54bc8918 SHA512 c473c48286ba8cc512ea045f65ab25bfc2343d166ebaa17f0d4738a63e9f1039ab4fdbbe1427b0f5df38ac05447bbece40e7e972c111818389f8d1990cddaebe MISC metadata.xml 570 BLAKE2B 84133a816858a9787c2e5c5ca839e8e1c4586bd428711f356c64ea23396b0fd2d4f00abb66f0de8f9c81f34058c537491dee5c539c27be58e709972a5d344dc0 SHA512 f3c7511b766a86fb0ebc7a8a9c88226ec71761da29f0b2a12eb593f3205170504d733cf09b0fb72103fea12ac323fa115a121ab9deb0609c6115ac571330ad01 diff --git a/dev-lang/rust/rust-1.29.2.ebuild b/dev-lang/rust/rust-1.29.2.ebuild index b1d1b8dd282a..a78fda48444d 100644 --- a/dev-lang/rust/rust-1.29.2.ebuild +++ b/dev-lang/rust/rust-1.29.2.ebuild @@ -21,14 +21,7 @@ else KEYWORDS="~amd64 ~arm64 ~x86" fi -CHOST_amd64=x86_64-unknown-linux-gnu -CHOST_x86=i686-unknown-linux-gnu -CHOST_arm64=aarch64-unknown-linux-gnu - RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0" -RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}" -RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}" -RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}" CARGO_DEPEND_VERSION="0.$(($(ver_cut 2) + 1)).0" @@ -83,8 +76,7 @@ toml_usex() { src_prepare() { local rust_stage0_root="${WORKDIR}"/rust-stage0 - local rust_stage0_name="RUST_STAGE0_${ARCH}" - local rust_stage0="${!rust_stage0_name}" + local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)" "${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die @@ -96,8 +88,7 @@ src_configure() { # Collect rust target names to compile standard libs for all ABIs. for v in $(multilib_get_enabled_abi_pairs); do - rust_target_name="CHOST_${v##*.}" - rust_targets="${rust_targets},\"${!rust_target_name}\"" + rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\"" done if use wasm; then rust_targets="${rust_targets},\"wasm32-unknown-unknown\"" @@ -124,7 +115,6 @@ src_configure() { local rust_stage0_root="${WORKDIR}"/rust-stage0 - rust_target_name="CHOST_${ARCH}" rust_target="$(rust_abi)" cat <<- EOF > "${S}"/config.toml -- cgit v1.2.3