summaryrefslogtreecommitdiffstats
path: root/debian/patches/d-bootstrap-custom-debuginfo-path.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-19 09:26:01 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-19 09:26:01 +0000
commitc29d7c1ba10d6debd11f9d8aad5d069a6491e60e (patch)
treea2ad46eb513b315f0efd8170af5eb08870165757 /debian/patches/d-bootstrap-custom-debuginfo-path.patch
parentMerging upstream version 1.76.0+dfsg1. (diff)
downloadrustc-c29d7c1ba10d6debd11f9d8aad5d069a6491e60e.tar.xz
rustc-c29d7c1ba10d6debd11f9d8aad5d069a6491e60e.zip
Adding debian version 1.76.0+dfsg1-1.debian/1.76.0+dfsg1-1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/d-bootstrap-custom-debuginfo-path.patch')
-rw-r--r--debian/patches/d-bootstrap-custom-debuginfo-path.patch54
1 files changed, 0 insertions, 54 deletions
diff --git a/debian/patches/d-bootstrap-custom-debuginfo-path.patch b/debian/patches/d-bootstrap-custom-debuginfo-path.patch
deleted file mode 100644
index 581c83e83..000000000
--- a/debian/patches/d-bootstrap-custom-debuginfo-path.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
-Date: Thu, 14 Jul 2022 13:17:39 +0200
-Subject: d-bootstrap-custom-debuginfo-path
-
-===================================================================
----
- src/bootstrap/src/lib.rs | 5 ++---
- src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs | 2 +-
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-Index: rust/src/bootstrap/src/lib.rs
-===================================================================
---- rust.orig/src/bootstrap/src/lib.rs
-+++ rust/src/bootstrap/src/lib.rs
-@@ -1163,10 +1163,9 @@ impl Build {
-
- match which {
- GitRepo::Rustc => {
-- let sha = self.rust_sha().unwrap_or(&self.version);
-- Some(format!("/rustc/{sha}"))
-+ Some(format!("/usr/src/rustc-{}", &self.version))
- }
-- GitRepo::Llvm => Some(String::from("/rustc/llvm")),
-+ GitRepo::Llvm => panic!("GitRepo::Llvm unsupported on Debian"),
- }
- }
-
-Index: rust/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs
-===================================================================
---- rust.orig/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs
-+++ rust/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs
-@@ -7,7 +7,7 @@
- // true automatically. If paths to std library hasn't been remapped, we use the
- // above simulate-remapped-rust-src-base option to do it temporarily
-
--// CHECK: !DIFile(filename: "{{/rustc/.*/library/std/src/panic.rs}}"
-+// CHECK: !DIFile(filename: "{{/usr/src/rustc-.*/library/std/src/panic.rs}}"
- fn main() {
- std::thread::spawn(|| {
- println!("hello");
-Index: rust/src/bootstrap/src/core/builder.rs
-===================================================================
---- rust.orig/src/bootstrap/src/core/builder.rs
-+++ rust/src/bootstrap/src/core/builder.rs
-@@ -1775,7 +1775,8 @@ impl<'a> Builder<'a> {
- cargo.env("CFG_VIRTUAL_RUST_SOURCE_BASE_DIR", map_to);
- }
-
-- if self.config.rust_remap_debuginfo {
-+ // Debian: this breaks with our vendored sources!
-+ if false && 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();