From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 41138138334 for ; Sun, 28 Oct 2018 21:24:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C3DBE0CB9; Sun, 28 Oct 2018 21:24:20 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D267CE0CB9 for ; Sun, 28 Oct 2018 21:24:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 58ED1335CC8 for ; Sun, 28 Oct 2018 21:24:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 10568440 for ; Sun, 28 Oct 2018 21:24:14 +0000 (UTC) From: "Dirkjan Ochtman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Dirkjan Ochtman" Message-ID: <1540761847.f4cd97ac2e4322f75738a9edb03fe216554121a9.djc@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/rust/rust-1.29.2.ebuild X-VCS-Directories: dev-lang/rust/ X-VCS-Committer: djc X-VCS-Committer-Name: Dirkjan Ochtman X-VCS-Revision: f4cd97ac2e4322f75738a9edb03fe216554121a9 X-VCS-Branch: master Date: Sun, 28 Oct 2018 21:24:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e8200499-221e-48cd-936a-5619849a4ddc X-Archives-Hash: 40abd95948a3f7d8b41ff97ff26136f4 commit: f4cd97ac2e4322f75738a9edb03fe216554121a9 Author: Marcus Comstedt mc pp se> AuthorDate: Sun Oct 28 21:23:01 2018 +0000 Commit: Dirkjan Ochtman gentoo org> CommitDate: Sun Oct 28 21:24:07 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4cd97ac dev-lang/rust: make better use of rust-toolchain.eclass Signed-off-by: Marcus Comstedt mc.pp.se> Signed-off-by: Dirkjan Ochtman gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 dev-lang/rust/rust-1.29.2.ebuild | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dev-lang/rust/rust-1.29.2.ebuild b/dev-lang/rust/rust-1.29.2.ebuild index b1d1b8dd282..a78fda48444 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