switch to LLVM 16

upstream switched their default version with 1.70.0

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/debian/bin/rust-lld b/debian/bin/rust-lld
index 285f1b0dad22af380ab2028227f8fb7e34f94ceb..b3880d793df4c680a16f6883892b4779e03c32f4 100755 (executable)
--- a/debian/bin/rust-lld
+++ b/debian/bin/rust-lld
@@ -6,4 +6,4 @@
 # However the tests fail for other reasons, namely we can't build rustdoc
 # (which runs the tests) in wasm32 yet. So this is just WIP at the moment,
 # it is not expect to work nor to be installed on user machines.
-exec /usr/bin/lld-15 "${@/#-Wl,/}"
+exec /usr/bin/lld-16 "${@/#-Wl,/}"

diff --git a/debian/control b/debian/control
index 5d3e69281fd61fe130c8951081301b8ddd84a7d5..2d7a5e2866e111c2d03acb7274a98c3b1397ea46 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,11 +16,11 @@ Build-Depends:
  cargo:native (>= 0.60.0)      <!pkg.rustc.dlstage0>,
  rustc:native (>= 1.69.0+dfsg) <!pkg.rustc.dlstage0>,
  rustc:native (<= 1.70.0++)    <!pkg.rustc.dlstage0>,
- llvm-15-dev:native,
- llvm-15-tools:native,
+ llvm-16-dev:native,
+ llvm-16-tools:native,
  gcc-mingw-w64-x86-64-posix:native [amd64] <!nowindows>,
  gcc-mingw-w64-i686-posix:native [i386] <!nowindows>,
- libllvm15 (>= 1:15.0.0),
+ libllvm16 (>= 1:16.0.0),
  cmake (>= 3.0) | cmake3,
 # needed by some vendor crates
  pkg-config,
@@ -41,7 +41,7 @@ Build-Depends:
 Build-Depends-Indep:
  wasi-libc (>= 0.0~git20230113.4362b18-2~) <!nowasm>,
  wasi-libc (<= 0.0~git20230113.4362b18++) <!nowasm>,
- clang-15:native,
+ clang-16:native,
 Build-Conflicts: gdb-minimal <!nocheck>
 Standards-Version: 4.6.2
 Homepage: http://www.rust-lang.org/
@@ -58,10 +58,10 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 Recommends:
  cargo (>= 0.71.0~~), cargo (<< 0.72.0~~),
 # llvm is needed for llvm-dwp for -C split-debuginfo=packed
- llvm-15,
+ llvm-16,
 Suggests:
 # lld and clang are needed for wasm compilation
- lld-15, clang-15,
+ lld-16, clang-16,
 Replaces: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)
 Breaks: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)
 Description: Rust systems programming language
@@ -156,7 +156,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 # Embeds wasi-libc so doesn't need to depend on it
 # None of its licenses require source redistrib, so no need for Built-Using
 Recommends:
- lld-15, clang-15,
+ lld-16, clang-16,
 Suggests:
 # nodejs contains wasi-node for running the program
  nodejs (>= 12.16),
@@ -202,7 +202,7 @@ Description: Rust debugger (gdb)
 Package: rust-lldb
 Architecture: all
 # When updating, also update rust-lldb.links
-Depends: lldb-15, ${misc:Depends}, python3-lldb-15
+Depends: lldb-16, ${misc:Depends}, python3-lldb-16
 Replaces: rustc (<< 1.1.0+dfsg1-1)
 Description: Rust debugger (lldb)
  Rust is a curly-brace, block-structured expression language.  It

diff --git a/debian/patches/d-rust-lldb-paths b/debian/patches/d-rust-lldb-paths
index bea7a38442aa49238d58a07d8ee79397525dc3c5..41f3b87b46ba23eff1cb239be33c2c5cd28d96a2 100644 (file)
--- a/debian/patches/d-rust-lldb-paths
+++ b/debian/patches/d-rust-lldb-paths
@@ -23,7 +23,7 @@ index bce72f1..793f593 100755
  RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb"
  
 -lldb=lldb
-+lldb=lldb-15
++lldb=lldb-16
  if [ -f "$RUST_LLDB" ]; then
      lldb="$RUST_LLDB"
  else

diff --git a/debian/rules b/debian/rules
index 460e55720670d360006fb97992b978c870b5eeec..499567b008947f19a2dbfc2fc65f6f043d304fa4 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -34,8 +34,8 @@ export RUST_LONG_VERSION
 DEB_DESTDIR := $(CURDIR)/debian/tmp
 
 # Use system LLVM (comment out to use vendored LLVM)
-LLVM_VERSION = 15
-OLD_LLVM_VERSION = 14
+LLVM_VERSION = 16
+OLD_LLVM_VERSION = 15
 # Make it easier to test against a custom LLVM
 ifneq (,$(LLVM_DESTDIR))
 LLVM_LIBRARY_PATH := $(LLVM_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH):$(LLVM_DESTDIR)/usr/lib

diff --git a/debian/rust-lldb.links b/debian/rust-lldb.links
index 561aff8b52129bf990a09160f15c30197b6d1493..e82fca912ce980bd447be3b408ec64365007af7b 100644 (file)
--- a/debian/rust-lldb.links
+++ b/debian/rust-lldb.links
@@ -1 +1 @@
-usr/share/man/man1/lldb-15.1.gz usr/share/man/man1/rust-lldb.1.gz
+usr/share/man/man1/lldb-16.1.gz usr/share/man/man1/rust-lldb.1.gz

diff --git a/debian/rustc.links b/debian/rustc.links
index 10826e2efeba54b75e6e9adb326758dace8aa3e3..d77996a8e9ed44cf3afa60a7aae88ec40ba451de 100644 (file)
--- a/debian/rustc.links
+++ b/debian/rustc.links
@@ -1,6 +1,6 @@
-usr/bin/lld-15 usr/bin/rust-lld
-usr/bin/clang-15 usr/bin/rust-clang
-usr/bin/llvm-dwp-15 usr/bin/rust-llvm-dwp
+usr/bin/lld-16 usr/bin/rust-lld
+usr/bin/clang-16 usr/bin/rust-clang
+usr/bin/llvm-dwp-16 usr/bin/rust-llvm-dwp
 # for -Z gcc-ld=lld, see compiler/rustc_codegen_ssa/src/back/link.rs for logic
 usr/bin/rust-lld usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/gcc-ld/ld
 usr/bin/rust-lld usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/gcc-ld/ld64