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 681D2158094 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 4ACB4E0BBA; 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 2D9F4E0BBA 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 1D169340FE6 for ; Fri, 23 Sep 2022 04:59:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5AA4E5B1 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.fdf46bba0c421619255362815cdefa4c83d94bf5.gyakovlev@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.64.0.ebuild X-VCS-Directories: dev-lang/rust/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: fdf46bba0c421619255362815cdefa4c83d94bf5 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: b70c5edd-7038-4d26-bc9b-81d3c33cd6b6 X-Archives-Hash: 8add216fbacc032af050efe3dab9d164 commit: fdf46bba0c421619255362815cdefa4c83d94bf5 Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Sep 23 04:48:33 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=fdf46bba dev-lang/rust: drop -gentoo-linux-musl target support originally we intended to match musl stages CHOST vendor field but opted in for patching upstream -unknown-linux-musl target to use dynamic linking by default. Signed-off-by: Georgy Yakovlev gentoo.org> dev-lang/rust/rust-1.64.0.ebuild | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/dev-lang/rust/rust-1.64.0.ebuild b/dev-lang/rust/rust-1.64.0.ebuild index 1ff74e470d00..69b586f8f355 100644 --- a/dev-lang/rust/rust-1.64.0.ebuild +++ b/dev-lang/rust/rust-1.64.0.ebuild @@ -163,7 +163,6 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/rust.asc PATCHES=( "${FILESDIR}"/1.55.0-ignore-broken-and-non-applicable-tests.patch "${FILESDIR}"/1.62.1-musl-dynamic-linking.patch - "${FILESDIR}"/1.61.0-gentoo-musl-target-specs.patch ) S="${WORKDIR}/${MY_P}-src" @@ -293,11 +292,6 @@ src_configure() { for v in $(multilib_get_enabled_abi_pairs); do rust_targets+=",\"$(rust_abi ${chost_target})\"" done - if use elibc_musl; then - # we also want to build our -gentoo- target on musl, in addition to - # -unknown- one provided by upstream - rust_targets+="${rust_targets//-unknown-/-gentoo-}" - fi if use wasm; then rust_targets+=",\"wasm32-unknown-unknown\"" if use system-llvm; then @@ -459,27 +453,10 @@ src_configure() { fi # by default librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true; # but we patch it and set to false here as well - # also we enable extra -gentoo- vendor triplet target with same settings as above - # musl-sysroot needs to be defined because rust treats it like an extra cross target - # so HOST still stays -unknown-, but --tagrget xx-gentoo-linux-musl will have stdlib. if use elibc_musl; then cat <<- _EOF_ >> "${S}"/config.toml crt-static = false - [target.${rust_target//-unknown-/-gentoo-}] - musl-root = "${ESYSROOT}/usr" - ar = "$(tc-getAR)" - cc = "$(tc-getCC)" - cxx = "$(tc-getCXX)" - linker = "$(tc-getCC)" - ranlib = "$(tc-getRANLIB)" - llvm-libunwind = "$(usex llvm-libunwind $(usex system-llvm system in-tree) no)" _EOF_ - if use system-llvm; then - cat <<- _EOF_ >> "${S}"/config.toml - llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" - _EOF_ - fi - fi done if use wasm; then