Update to LLVM 9

This commit is contained in:
Ximin Luo 2019-12-16 22:38:28 +00:00
parent f8779a3185
commit e7dbf345c7
6 changed files with 18 additions and 12 deletions

6
debian/changelog vendored
View File

@ -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.

12
debian/control vendored
View File

@ -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

View File

@ -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

6
debian/rules vendored
View File

@ -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

View File

@ -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

2
debian/rustc.links vendored
View File

@ -1 +1 @@
usr/bin/lld-8 usr/bin/rust-lld
usr/bin/lld-9 usr/bin/rust-lld