45e2c3bd44
Removed dmraid, iniparser, jam, libatasmart, libblockdev, libbytesize, libyaml, mozjs, ndctl, polkit, rpi-userland, sccache from base
Removed docdir, sysconfdir and prefix quotes from autoconf build option and similar options from various packages in base
Added apparch variables to base/{acpid,dmidecode,gnu-efi,pciutils,syslinux}
Added udev rules build option to base/alsa-utils
Discarded --offline option in base/cbindgen
Upgraded base/cmake to 3.26.4
Added --without-x build option to base/dialog
Upgraded base/gawk to 5.2.2
Upgraded base/glib to 2.76.3
Disabled tests and examples in base/gloox
Upgraded base/gnupg2 to 2.2.41
Upgraded base/gnutls to 3.8.0
Upgraded base/gpgme to 1.20.0
Fixed make command option ordering in base/{hdparm,p7zip}
Upgraded base/libgpg-error to 1.47
Upgraded base/libjpeg-turbo to 2.1.5.1
Upgraded base/libuv to 1.45.0
Discarded some build options to base/libxml2
Upgraded base/llvm to 15.0.7
Fixed subshell code in base/lua53
Removed --prefix= in several python package build files, added /usr as prefix in base/python3
Upgraded base/musl to 1.2.4
Upgraded base/nettle to 3.9
Upgraded base/nghttp2 to 1.53.0
Added --without-trust-paths to base/p11-kit
Upgraded base/qpdf to 11.4.0
Discarded base/rpi-userland
Upgraded base/rust to 1.69.0
Upgraded base/sqlite to 3420000
Added $CFLAGS to base/unzip
Added -fPIC option to base/yasm
Updated base build list
69 lines
2.6 KiB
Diff
69 lines
2.6 KiB
Diff
From 8938b002edbec432be46de7b6f1b9d0a6912873a Mon Sep 17 00:00:00 2001
|
|
From: Daniel Kolesa <daniel@octaforge.org>
|
|
Date: Mon, 20 Dec 2021 00:45:35 +0100
|
|
Subject: [PATCH 03/15] move debugger scripts to /usr/share/rust
|
|
|
|
---
|
|
src/bootstrap/dist.rs | 2 +-
|
|
src/etc/rust-gdb | 2 +-
|
|
src/etc/rust-gdbgui | 2 +-
|
|
src/etc/rust-lldb | 4 ++--
|
|
4 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
|
|
index b1fae356d..e7a077134 100644
|
|
--- a/src/bootstrap/dist.rs
|
|
+++ b/src/bootstrap/dist.rs
|
|
@@ -460,7 +460,7 @@ impl Step for DebuggerScripts {
|
|
fn run(self, builder: &Builder<'_>) {
|
|
let host = self.host;
|
|
let sysroot = self.sysroot;
|
|
- let dst = sysroot.join("lib/rustlib/etc");
|
|
+ let dst = sysroot.join("share/rust");
|
|
t!(fs::create_dir_all(&dst));
|
|
let cp_debugger_script = |file: &str| {
|
|
builder.install(&builder.src.join("src/etc/").join(file), &dst, 0o644);
|
|
diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb
|
|
index b950cea79..559bfe3f1 100755
|
|
--- a/src/etc/rust-gdb
|
|
+++ b/src/etc/rust-gdb
|
|
@@ -12,7 +12,7 @@ fi
|
|
|
|
# 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"
|
|
|
|
# Run GDB with the additional arguments that load the pretty printers
|
|
# Set the environment variable `RUST_GDB` to overwrite the call to a
|
|
diff --git a/src/etc/rust-gdbgui b/src/etc/rust-gdbgui
|
|
index 9744913b6..8722acdcc 100755
|
|
--- a/src/etc/rust-gdbgui
|
|
+++ b/src/etc/rust-gdbgui
|
|
@@ -41,7 +41,7 @@ fi
|
|
|
|
# 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"
|
|
|
|
# Set the environment variable `RUST_GDB` to overwrite the call to a
|
|
# different/specific command (defaults to `gdb`).
|
|
diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb
|
|
index bce72f1ba..8abb01245 100755
|
|
--- a/src/etc/rust-lldb
|
|
+++ b/src/etc/rust-lldb
|
|
@@ -30,8 +30,8 @@ EOF
|
|
fi
|
|
fi
|
|
|
|
-script_import="command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_lookup.py\""
|
|
-commands_file="$RUSTC_SYSROOT/lib/rustlib/etc/lldb_commands"
|
|
+script_import="command script import \"$RUSTC_SYSROOT/share/rust/lldb_lookup.py\""
|
|
+commands_file="$RUSTC_SYSROOT/share/rust/lldb_commands"
|
|
|
|
# Call LLDB with the commands added to the argument list
|
|
exec "$lldb" --one-line-before-file "$script_import" --source-before-file "$commands_file" "$@"
|
|
--
|
|
2.37.2
|
|
|