summaryrefslogtreecommitdiffstats
path: root/debian/patches/d-rust-gdb-paths
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:03:05 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:03:05 +0000
commit217d9223a5aa75daf9f286fd1fc06dae379b5dbc (patch)
treeb43bedae234ad56894a82934ee57e3619f3374d5 /debian/patches/d-rust-gdb-paths
parentAdding upstream version 1.64.0+dfsg1. (diff)
downloadrustc-217d9223a5aa75daf9f286fd1fc06dae379b5dbc.tar.xz
rustc-217d9223a5aa75daf9f286fd1fc06dae379b5dbc.zip
Adding debian version 1.64.0+dfsg1-1.debian/1.64.0+dfsg1-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/d-rust-gdb-paths')
-rw-r--r--debian/patches/d-rust-gdb-paths39
1 files changed, 39 insertions, 0 deletions
diff --git a/debian/patches/d-rust-gdb-paths b/debian/patches/d-rust-gdb-paths
new file mode 100644
index 000000000..4be3024ea
--- /dev/null
+++ b/debian/patches/d-rust-gdb-paths
@@ -0,0 +1,39 @@
+From: Angus Lees <gus@debian.org>
+Date: Thu, 14 Jul 2022 13:17:39 +0200
+Subject: Hardcode GDB 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-gdb | 2 +-
+ src/etc/rust-gdbgui | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb
+index b950cea..5ec8752 100755
+--- a/src/etc/rust-gdb
++++ b/src/etc/rust-gdb
+@@ -11,7 +11,7 @@ else
+ fi
+
+ # Find out where the pretty printer Python module is
+-RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
++RUSTC_SYSROOT="$(if type "$RUSTC" >/dev/null 2>&1; then "$RUSTC" --print=sysroot; else echo /usr; fi)"
+ GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
+
+ # Run GDB with the additional arguments that load the pretty printers
+diff --git a/src/etc/rust-gdbgui b/src/etc/rust-gdbgui
+index 9744913..613737d 100755
+--- a/src/etc/rust-gdbgui
++++ b/src/etc/rust-gdbgui
+@@ -40,7 +40,7 @@ else
+ fi
+
+ # Find out where the pretty printer Python module is
+-RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
++RUSTC_SYSROOT="$(if type "$RUSTC" >/dev/null 2>&1; then "$RUSTC" --print=sysroot; else echo /usr; fi)"
+ GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
+
+ # Set the environment variable `RUST_GDB` to overwrite the call to a