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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 649CC158003 for ; Fri, 23 Sep 2022 04:59:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46506E0BB7; Fri, 23 Sep 2022 04:59:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 27833E0BB7 for ; Fri, 23 Sep 2022 04:59:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DD1D9340FB8 for ; Fri, 23 Sep 2022 04:59:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 460FBD4 for ; Fri, 23 Sep 2022 04:59:14 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1663908585.0433bdce4b55fe0d3fb0071bcb826af0acef7d4d.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/rust-bin/rust-bin-1.64.0.ebuild X-VCS-Directories: dev-lang/rust-bin/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 0433bdce4b55fe0d3fb0071bcb826af0acef7d4d X-VCS-Branch: master Date: Fri, 23 Sep 2022 04:59: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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bfee42f4-df7b-43a0-9cfd-acef9996ceba X-Archives-Hash: 45a46f00be6070e834c9a98d35bc6020 commit: 0433bdce4b55fe0d3fb0071bcb826af0acef7d4d Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Sep 23 04:43:12 2022 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Sep 23 04:49:45 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0433bdce dev-lang/rust-bin: improve musl envd file in 1.64.0 Signed-off-by: Georgy Yakovlev gentoo.org> dev-lang/rust-bin/rust-bin-1.64.0.ebuild | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dev-lang/rust-bin/rust-bin-1.64.0.ebuild b/dev-lang/rust-bin/rust-bin-1.64.0.ebuild index 9e2846e0a8ac..9e7e4048e675 100644 --- a/dev-lang/rust-bin/rust-bin-1.64.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.64.0.ebuild @@ -152,12 +152,14 @@ multilib_src_install() { dosym "../../opt/${P}/lib/rustlib" "/usr/lib/rustlib-bin-${PV}" dosym "../../../opt/${P}/share/doc/rust" "/usr/share/doc/${P}" - # musl logic can be improved a bit, but fine as is for now + # make all capital underscored variable + local CARGO_TRIPLET="$(rust_abi)" + CARGO_TRIPLET="${CARGO_TRIPLET//-/_}" + CARGO_TRIPLET="${CARGO_TRIPLET^^}" cat <<-_EOF_ > "${T}/50${P}" LDPATH="${EPREFIX}/usr/lib/rust/lib" MANPATH="${EPREFIX}/usr/lib/rust/man" - $(use amd64 && usex elibc_musl 'CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '') - $(use arm64 && usex elibc_musl 'CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '') + $(usev elibc_musl "CARGO_TARGET_${CARGO_TRIPLET}_RUSTFLAGS=\"-C target-feature=-crt-static\"") _EOF_ doenvd "${T}/50${P}"