PktSurf
9d657e0a1d
Renamed .SMBuild files to smbuild for simplicity Added musl-fts, musl-obstack, glslang, python-glad, libptytty, libmilter, elfutils and fuse to base section build list Discarded fuse2 and fuse3 from base section Temporarily discarded slapt-get, syslinux, p7zip, acpid, libelf-compat, gnu-eif, libtirpc, mozilla-nss, lua53, qpdf, kernel-source and signify from base section build list Disabled nls and made amends to base/e2fsprogs Upgraded base/git to 2.46.2 Upgraded extra/gnumeric to 1.12.57 Disabled nls in base/gnutls, extra/dia Disabled a patch and made amends in base/llvm Fixed configure.local file in base/mandoc Upgraded base/rust to 1.79 Fixed a ton of build files to use build prefix as /usr and miscellaneous changes Discarded extra/bluez,blueman,scrcpy,adafruit-io Added tomb to extra Added new build option to extra/libass Upgraded extra/mpv to 0.37.0 Disabled tests in gtk/gdk-pixbuf Upgraded gtk/goffice to 0.10.57 Added gtk-doc to gtk section Fixed build options in gtk/gtk2 Added new patches to gtk/gtk3 Added gtksourceview to gtk section Added vulkan-headers to xorg section Upgraded xorg/mesa to 23.1.9 Added libplacebo to xorg section Fixed build stuff in xorg/glew
26 lines
936 B
Diff
26 lines
936 B
Diff
diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb
|
|
index 9abed30..c5326ae 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/etc"
|
|
# Get the commit hash for path remapping
|
|
RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-Z0-9_]*\)/\1/p')"
|
|
|
|
diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb
|
|
index bce72f1..ecac488 100755
|
|
--- a/src/etc/rust-lldb
|
|
+++ b/src/etc/rust-lldb
|
|
@@ -8,7 +8,7 @@ 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)
|
|
-RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb"
|
|
+RUST_LLDB="$RUSTC_SYSROOT/share/rust/etc"
|
|
|
|
lldb=lldb
|
|
if [ -f "$RUST_LLDB" ]; then
|