[gentoo-commits] proj/rust-patches:1.77 commit in: /

["Matt Jolly" <kangie@gentoo.org>]

commit:     75008d1d32a37a21972022ff6b10e5fc9baea5df
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=75008d1d

Add patches for Rust 1.77.1-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.76.0-loong-code-model.patch

Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>

 1.75.0-handle-vendored-sources.patch | 45 ------------------------------------
 1 file changed, 45 deletions(-)

diff --git a/1.75.0-handle-vendored-sources.patch b/1.75.0-handle-vendored-sources.patch
deleted file mode 100644
index c68ceba..0000000
--- a/1.75.0-handle-vendored-sources.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 4b7e0a0b56aa2446e670dfd6558380a1039a86aa Mon Sep 17 00:00:00 2001
-From: Arlo Siemsen <arsiem@microsoft.com>
-Date: Thu, 4 Jan 2024 11:40:56 -0600
-Subject: [PATCH] Handle vendored sources when remapping paths
-
-Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
----
- 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
-