From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B6AE91580E0 for ; Mon, 02 Jun 2025 09:25:39 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id A34113430D9 for ; Mon, 02 Jun 2025 09:25:39 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 88F9E1104B8; Mon, 02 Jun 2025 09:25:15 +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)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 7A0DA1104B7 for ; Mon, 02 Jun 2025 09:25:15 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 32E02343007 for ; Mon, 02 Jun 2025 09:25:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E88B28FC for ; Mon, 02 Jun 2025 09:25:12 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748856136.f07a431a8b9d053d536b71a137f85621583d131b.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.78 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.75.0-handle-vendored-sources.patch 1.75.0-musl-dynamic-linking.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: f07a431a8b9d053d536b71a137f85621583d131b X-VCS-Branch: 1.78 Date: Mon, 02 Jun 2025 09:25:12 +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: 0ead3432-6bc2-47af-a017-f7f2f707015d X-Archives-Hash: 4d7bd39215aa6d839f8817a23f014dad Message-ID: <20250602092512.sO8JsFMNXjffppQ91nm6hy_ivGNxBhnIaZ4PsM56KLA@z> commit: f07a431a8b9d053d536b71a137f85621583d131b Author: Matt Jolly gentoo org> AuthorDate: Mon Jun 2 09:22:16 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Mon Jun 2 09:22:16 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=f07a431a Add patches for Rust 1.75.0-r101 Patches: - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.75.0-handle-vendored-sources.patch - 1.75.0-musl-dynamic-linking.patch Signed-off-by: Matt Jolly gentoo.org> 1.75.0-handle-vendored-sources.patch | 39 ++++++++++++++++++++++ ...king.patch => 1.75.0-musl-dynamic-linking.patch | 4 +-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/1.75.0-handle-vendored-sources.patch b/1.75.0-handle-vendored-sources.patch new file mode 100644 index 0000000..5d39022 --- /dev/null +++ b/1.75.0-handle-vendored-sources.patch @@ -0,0 +1,39 @@ +From 4b7e0a0b56aa2446e670dfd6558380a1039a86aa Mon Sep 17 00:00:00 2001 +From: Arlo Siemsen +Date: Thu, 4 Jan 2024 11:40:56 -0600 +Subject: [PATCH] Handle vendored sources when remapping paths + +Signed-off-by: Randy Barlow +--- a/src/bootstrap/src/core/builder.rs ++++ b/src/bootstrap/src/core/builder.rs +@@ -1799,15 +1799,20 @@ pub fn cargo( + } + + if self.config.rust_remap_debuginfo { +- // FIXME: handle vendored sources +- let registry_src = t!(home::cargo_home()).join("registry").join("src"); + let mut env_var = OsString::new(); +- for entry in t!(std::fs::read_dir(registry_src)) { +- if !env_var.is_empty() { +- env_var.push("\t"); +- } +- env_var.push(t!(entry).path()); ++ if self.config.vendor { ++ let vendor = self.build.src.join("vendor"); ++ env_var.push(vendor); + env_var.push("=/rust/deps"); ++ } else { ++ let registry_src = t!(home::cargo_home()).join("registry").join("src"); ++ for entry in t!(std::fs::read_dir(registry_src)) { ++ if !env_var.is_empty() { ++ env_var.push("\t"); ++ } ++ env_var.push(t!(entry).path()); ++ env_var.push("=/rust/deps"); ++ } + } + cargo.env("RUSTC_CARGO_REGISTRY_SRC_TO_REMAP", env_var); + } +-- +2.43.0 + diff --git a/1.62.1-musl-dynamic-linking.patch b/1.75.0-musl-dynamic-linking.patch similarity index 82% rename from 1.62.1-musl-dynamic-linking.patch rename to 1.75.0-musl-dynamic-linking.patch index b64775c..7dc34f8 100644 --- a/1.62.1-musl-dynamic-linking.patch +++ b/1.75.0-musl-dynamic-linking.patch @@ -4,8 +4,8 @@ Date: Tue, 2 Aug 2022 18:32:53 -0500 Subject: [PATCH] Enable dynamic linking by default for musl Signed-off-by: Jory Pratt ---- a/compiler/rustc_target/src/spec/linux_musl_base.rs -+++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +--- a/compiler/rustc_target/src/spec/base/linux_musl.rs ++++ b/compiler/rustc_target/src/spec/base/linux_musl.rs @@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { base.crt_objects_fallback = Some(CrtObjectsFallback::Musl);