commit: 88334212dc1ebbfd9bfce3e163984c23292e582e Author: Matt Jolly <kangie <AT> gentoo <DOT> org> AuthorDate: Sat May 31 05:54:45 2025 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Sat May 31 05:54:45 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=88334212
Add patches for Rust 1.75.0-r101 Patches: - 1.75.0-musl-dynamic-linking.patch - 1.74.1-cross-compile-libz.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.67.0-doc-wasm.patch - 1.75.0-handle-vendored-sources.patch Signed-off-by: Matt Jolly <kangie <AT> gentoo.org> 1.75.0-handle-vendored-sources.patch | 45 ++++++++++++++++++++++ ...king.patch => 1.75.0-musl-dynamic-linking.patch | 10 +---- 2 files changed, 47 insertions(+), 8 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..c68ceba --- /dev/null +++ b/1.75.0-handle-vendored-sources.patch @@ -0,0 +1,45 @@ +From 4b7e0a0b56aa2446e670dfd6558380a1039a86aa Mon Sep 17 00:00:00 2001 +From: Arlo Siemsen <[email protected]> +Date: Thu, 4 Jan 2024 11:40:56 -0600 +Subject: [PATCH] Handle vendored sources when remapping paths + +Signed-off-by: Randy Barlow <[email protected]> +--- + src/bootstrap/src/core/builder.rs | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs +index 4e20babc55a..3770d0687b2 100644 +--- 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 58% rename from 1.62.1-musl-dynamic-linking.patch rename to 1.75.0-musl-dynamic-linking.patch index fd56396..7dc34f8 100644 --- a/1.62.1-musl-dynamic-linking.patch +++ b/1.75.0-musl-dynamic-linking.patch @@ -4,14 +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 <[email protected]> ---- - compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs -index 207a87ab0..8a5a43363 100644 ---- 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);
