From 217d9223a5aa75daf9f286fd1fc06dae379b5dbc Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:03:05 +0200 Subject: Adding debian version 1.64.0+dfsg1-1. Signed-off-by: Daniel Baumann --- .../d-bootstrap-custom-debuginfo-path.patch | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 debian/patches/d-bootstrap-custom-debuginfo-path.patch (limited to 'debian/patches/d-bootstrap-custom-debuginfo-path.patch') diff --git a/debian/patches/d-bootstrap-custom-debuginfo-path.patch b/debian/patches/d-bootstrap-custom-debuginfo-path.patch new file mode 100644 index 000000000..f955cffbf --- /dev/null +++ b/debian/patches/d-bootstrap-custom-debuginfo-path.patch @@ -0,0 +1,40 @@ +From: Debian Rust Maintainers +Date: Thu, 14 Jul 2022 13:17:39 +0200 +Subject: d-bootstrap-custom-debuginfo-path + +=================================================================== +--- + src/bootstrap/lib.rs | 5 ++--- + src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs | 2 +- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs +index ddc92ba..259b56e 100644 +--- a/src/bootstrap/lib.rs ++++ b/src/bootstrap/lib.rs +@@ -1023,10 +1023,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"), + } + } + +diff --git a/src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs b/src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs +index b66abc6..f6efe1e 100644 +--- a/src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs ++++ b/src/test/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"); -- cgit v1.2.3