summaryrefslogtreecommitdiffstats
path: root/debian/patches/d-rust-lldb-paths
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-19 09:26:37 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-19 09:26:37 +0000
commit1c69ecb2dd463a5cd922e872386381e1cc17147e (patch)
treed49e9c5086b704151975474cb9ae68509ffa4787 /debian/patches/d-rust-lldb-paths
parentMerging upstream version 1.76.0+dfsg1. (diff)
downloadrustc-1c69ecb2dd463a5cd922e872386381e1cc17147e.tar.xz
rustc-1c69ecb2dd463a5cd922e872386381e1cc17147e.zip
Merging debian version 1.76.0+dfsg1-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/d-rust-lldb-paths')
-rw-r--r--debian/patches/d-rust-lldb-paths29
1 files changed, 0 insertions, 29 deletions
diff --git a/debian/patches/d-rust-lldb-paths b/debian/patches/d-rust-lldb-paths
deleted file mode 100644
index 02935200e..000000000
--- a/debian/patches/d-rust-lldb-paths
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Angus Lees <gus@debian.org>
-Date: Thu, 14 Jul 2022 13:17:39 +0200
-Subject: Hardcode LLDB python module directory
-
-Forwarded: not-needed
-
-Debian package installs python modules into a fixed directory, so
-just hardcode path in wrapper script.
----
- src/etc/rust-lldb | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: rust/src/etc/rust-lldb
-===================================================================
---- rust.orig/src/etc/rust-lldb
-+++ rust/src/etc/rust-lldb
-@@ -7,10 +7,10 @@ set -e
- host=$(rustc -vV | sed -n -e 's/^host: //p')
-
- # Find out where to look for the pretty printer Python module
--RUSTC_SYSROOT=$(rustc --print sysroot)
-+RUSTC_SYSROOT="$(if type "$RUSTC" >/dev/null 2>&1; then "$RUSTC" --print=sysroot; else echo /usr; fi)"
- RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb"
-
--lldb=lldb
-+lldb=lldb-17
- if [ -f "$RUST_LLDB" ]; then
- lldb="$RUST_LLDB"
- else