diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:26:01 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:26:01 +0000 |
commit | c29d7c1ba10d6debd11f9d8aad5d069a6491e60e (patch) | |
tree | a2ad46eb513b315f0efd8170af5eb08870165757 /debian/patches/behaviour/d-rust-lldb-paths.patch | |
parent | Merging upstream version 1.76.0+dfsg1. (diff) | |
download | rustc-debian.tar.xz rustc-debian.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/behaviour/d-rust-lldb-paths.patch')
-rw-r--r-- | debian/patches/behaviour/d-rust-lldb-paths.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/debian/patches/behaviour/d-rust-lldb-paths.patch b/debian/patches/behaviour/d-rust-lldb-paths.patch new file mode 100644 index 000000000..6afe0cc19 --- /dev/null +++ b/debian/patches/behaviour/d-rust-lldb-paths.patch @@ -0,0 +1,29 @@ +From: Angus Lees <gus@debian.org> +Date: Thu, 14 Jul 2022 13:17:39 +0200 +Subject: Hardcode LLDB python module directory + +Debian package installs python modules into a fixed directory, so +just hardcode path in wrapper script. + +Forwarded: not-needed +--- + src/etc/rust-lldb | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb +index bce72f1..38e76c2 100755 +--- a/src/etc/rust-lldb ++++ b/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 |