Update to LLVM 9

diff --git a/debian/changelog b/debian/changelog
index 787d452698f19cc713ad4b144264d9fcda7c9b71..c56649a06709e0d15cac3c1cd3c62505da2140d9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rustc (1.39.0+dfsg1-4) UNRELEASED; urgency=medium
+
+  * Update to LLVM 9.
+
+ -- Ximin Luo <infinity0@debian.org>  Mon, 16 Dec 2019 22:33:51 +0000
+
 rustc (1.39.0+dfsg1-3) unstable; urgency=medium
 
   * Fix mips patch involving mxgot for new RUSTFLAGS behaviour.

diff --git a/debian/control b/debian/control
index 46bc37e87b446e4872293cf77f74fba7f2c813f1..171f8b5f2d7fcea8acb704121bb8631e15484780 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,9 @@ Build-Depends: debhelper (>= 9),
                cargo:native (>= 0.40.0)      <!pkg.rustc.dlstage0>,
                rustc:native (>= 1.38.0+dfsg) <!pkg.rustc.dlstage0>,
                rustc:native (<= 1.39.0++)    <!pkg.rustc.dlstage0>,
-               llvm-8-dev:native,
-               llvm-8-tools:native,
-               libllvm8,
+               llvm-9-dev:native,
+               llvm-9-tools:native,
+               libllvm9,
                autotools-dev,
                cmake (>= 3.0) | cmake3,
 # needed by some vendor crates
@@ -50,7 +50,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, libstd-rust-dev (= ${binary:Version}),
  gcc, libc-dev, binutils (>= 2.26)
 Recommends: cargo (>= 0.40.0~~), cargo (<< 0.41.0~~), rust-gdb | rust-lldb
-Suggests: rust-doc, rust-src, lld-8
+Suggests: rust-doc, rust-src, lld-9
 Replaces: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)
 Breaks: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)
 Description: Rust systems programming language
@@ -111,7 +111,7 @@ Description: Rust standard libraries - development files
 Package: libstd-rust-dev-wasm32-cross
 Section: libdevel
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, lld-8
+Depends: ${shlibs:Depends}, ${misc:Depends}, lld-9
 Description: Rust standard libraries - development files
  Rust is a curly-brace, block-structured expression language.  It
  visually resembles the C language family, but differs significantly
@@ -152,7 +152,7 @@ Description: Rust debugger (gdb)
 Package: rust-lldb
 Architecture: all
 # When updating, also update rust-lldb.links
-Depends: lldb-8, ${misc:Depends}, python3-lldb-8
+Depends: lldb-9, ${misc:Depends}, python3-lldb-9
 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 f0e802b98a1daec07b3e1cd2f2209c11eaf0d036..cb3489dda3e6a522d6721fb1f954c7b414320f9b 100644 (file)
--- a/debian/patches/d-rust-lldb-paths
+++ b/debian/patches/d-rust-lldb-paths
@@ -11,7 +11,7 @@ Forwarded: not-needed
  RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb"
  
 -lldb=lldb
-+lldb=lldb-8
++lldb=lldb-9
  if [ -f "$RUST_LLDB" ]; then
      lldb="$RUST_LLDB"
  else

diff --git a/debian/rules b/debian/rules
index 3026b4c70dbbf8798460bd06ed55b52e69e517a3..3ee919deb15fd1abe53df4f8efc9a5e5f53b8bc5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -33,8 +33,8 @@ export DEB_HOST_RUST_TYPE
 DEB_DESTDIR := $(CURDIR)/debian/tmp
 
 # Use system LLVM (comment out to use vendored LLVM)
-LLVM_VERSION = 8
-OLD_LLVM_VERSION = 7
+LLVM_VERSION = 9
+OLD_LLVM_VERSION = 8
 # 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
@@ -173,7 +173,7 @@ debian/rust-src.%: debian/rust-src.%.in
 
 debian/dh_auto_configure.stamp: debian/config.toml
        # fail the build if we have any instances of OLD_LLVM_VERSION in debian, except for debian/changelog
-       ! grep --color=always -i 'll\(..\|d\)-\?$(subst .,\.,$(OLD_LLVM_VERSION))' --exclude=changelog --exclude='*.patch' -R debian
+       ! grep --color=always -i 'll\(..\|d\)-\?$(subst .,\.,$(OLD_LLVM_VERSION))' --exclude=changelog --exclude='*.patch' --exclude-dir='.debhelper' -R debian
        # fail the build if we accidentally vendored openssl, indicates we pulled in unnecessary dependencies
        test ! -e vendor/openssl
        # fail the build if we didn't update d-ignore-error-detail-diff.patch

diff --git a/debian/rust-lldb.links b/debian/rust-lldb.links
index beae1fbd738f8d5bef4393220b9b1224e7e85d83..b10383e75175bbf146565be160cf7bafb8e4b815 100644 (file)
--- a/debian/rust-lldb.links
+++ b/debian/rust-lldb.links
@@ -1 +1 @@
-usr/share/man/man1/lldb-8.1.gz usr/share/man/man1/rust-lldb.1.gz
+usr/share/man/man1/lldb-9.1.gz usr/share/man/man1/rust-lldb.1.gz

diff --git a/debian/rustc.links b/debian/rustc.links
index ba8e8ead9ff55f8c024701b1f9d86bceaf2bedec..38d7556fa2b2ba331337aa6e3d2922701c85755b 100644 (file)
--- a/debian/rustc.links
+++ b/debian/rustc.links
@@ -1 +1 @@
-usr/bin/lld-8 usr/bin/rust-lld
+usr/bin/lld-9 usr/bin/rust-lld