From 3db351aa5647eb4a482e9e008bedcf1a5be51302 Mon Sep 17 00:00:00 2001 From: Shiz Date: Sun, 16 Apr 2017 15:56:18 +0000 Subject: testing/rust: reorganize patches This divides up the patches in three logical categories: - musl-*.patch: musl support patches intended for upstreaming; - alpine-*.patch: Alpine-specific patches that are likely not upstreamable; - *.patch: functionality patch that may make it upstream. --- testing/rust/alpine-move-py-scripts-to-share.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 testing/rust/alpine-move-py-scripts-to-share.patch (limited to 'testing/rust/alpine-move-py-scripts-to-share.patch') diff --git a/testing/rust/alpine-move-py-scripts-to-share.patch b/testing/rust/alpine-move-py-scripts-to-share.patch new file mode 100644 index 0000000000..dcab4abd81 --- /dev/null +++ b/testing/rust/alpine-move-py-scripts-to-share.patch @@ -0,0 +1,22 @@ +--- a/src/etc/rust-gdb ++++ b/src/etc/rust-gdb +@@ -14,7 +14,7 @@ + + # Find out where the pretty printer Python module is + RUSTC_SYSROOT=`rustc --print=sysroot` +-GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc" ++GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/share/rust/etc" + + # Run GDB with the additional arguments that load the pretty printers + PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" gdb \ +--- a/src/etc/rust-lldb ++++ b/src/etc/rust-lldb +@@ -33,7 +33,7 @@ + RUSTC_SYSROOT=`rustc --print sysroot` + + # Write the LLDB script to the tempfile +-echo "command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_rust_formatters.py\"" >> $TMPFILE ++echo "command script import \"$RUSTC_SYSROOT/share/rust/etc/lldb_rust_formatters.py\"" >> $TMPFILE + echo "type summary add --no-value --python-function lldb_rust_formatters.print_val -x \".*\" --category Rust" >> $TMPFILE + echo "type category enable Rust" >> $TMPFILE + -- cgit v1.2.3