Merge branch 'debian/sid' into debian/experimental

debian/README.source

@@ -60,6 +60,15 @@ annoying stuff like building LLVM and downloading dependencies from crates.io,
 simply unpack the tarball and run `./configure && ./x.py build` etc as normal.
 This can be useful for confirming that an issue is caused by Debian's LLVM.
 
+If you need to test a LLVM patch, do something like this:
+
+# build your patched LLVM debs, then:
+$ mkdir -p llvm-destdir && cd llvm-destdir
+$ for i in llvm-4.0 llvm-4.0-dev llvm-4.0-runtime llvm-4.0-tools libllvm4.0; do \
+    dpkg -x ../"$i"_*${VERSION}_*.deb .; done
+$ cd ../rustc
+$ debian/rules LLVM_DESTDIR=$PWD/../llvm-destdir build
+
 
 Embedded libraries
 ==================

debian/changelog

@@ -4,6 +4,18 @@ rustc (1.20.0+dfsg1-1) UNRELEASED; urgency=medium
 
  -- Ximin Luo <infinity0@debian.org>  Tue, 19 Sep 2017 13:01:02 +0200
 
+rustc (1.19.0+dfsg3-4) unstable; urgency=medium
+
+  * Bump LLVM requirement to pull in a fix for a FTBFS on ppc64el.
+
+ -- Ximin Luo <infinity0@debian.org>  Sun, 15 Oct 2017 21:31:03 +0200
+
+rustc (1.19.0+dfsg3-3) unstable; urgency=medium
+
+  * Fix a trailing whitespace for tidy.
+
+ -- Ximin Luo <infinity0@debian.org>  Tue, 19 Sep 2017 16:09:41 +0200
+
 rustc (1.19.0+dfsg3-2) unstable; urgency=medium
 
   * Upload to unstable.

debian/config.toml.in

@@ -13,16 +13,16 @@ docs = false
 prefix = "/usr"
 
 [target.DEB_BUILD_RUST_TYPE]
-llvm-config = "/usr/lib/llvm-LLVM_VERSION/bin/llvm-config"
+llvm-config = "LLVM_DESTDIR/usr/lib/llvm-LLVM_VERSION/bin/llvm-config"
 
 ifelse(DEB_BUILD_RUST_TYPE,DEB_HOST_RUST_TYPE,,
 [target.DEB_HOST_RUST_TYPE]
-llvm-config = "/usr/lib/llvm-LLVM_VERSION/bin/llvm-config"
+llvm-config = "LLVM_DESTDIR/usr/lib/llvm-LLVM_VERSION/bin/llvm-config"
 
 )dnl
 ifelse(DEB_BUILD_RUST_TYPE,DEB_TARGET_RUST_TYPE,,DEB_HOST_RUST_TYPE,DEB_TARGET_RUST_TYPE,,
 [target.DEB_TARGET_RUST_TYPE]
-llvm-config = "/usr/lib/llvm-LLVM_VERSION/bin/llvm-config"
+llvm-config = "LLVM_DESTDIR/usr/lib/llvm-LLVM_VERSION/bin/llvm-config"
 
 )dnl
 [llvm]

debian/control

@@ -14,9 +14,9 @@ Build-Depends: debhelper (>= 9),
                cargo:native (>= 0.19.0)      <!pkg.rustc.dlstage0>,
                rustc:native (>= 1.19.0+dfsg) <!pkg.rustc.dlstage0>,
                rustc:native (<= 1.20.0++)    <!pkg.rustc.dlstage0>,
-               llvm-4.0-dev:native   (>= 1:4.0.1-5),
-               llvm-4.0-tools:native (>= 1:4.0.1-5),
-               libllvm4.0            (>= 1:4.0.1-5),
+               llvm-4.0-dev:native   (>= 1:4.0.1-6),
+               llvm-4.0-tools:native (>= 1:4.0.1-6),
+               libllvm4.0            (>= 1:4.0.1-6),
                autotools-dev,
                cmake (>= 3.0) | cmake3,
                gperf,

debian/patches/series

@@ -15,7 +15,6 @@ u-ignoretest-armhf_06.patch
 u-ignoretest-arm64.patch
 u-ignoretest-ppc64el.patch
 u-ignoretest-ppc64el_02.patch
-u-ignoretest-ppc64el_03.patch
 
 # not forwarded, or forwarded but unlikely to be merged
 u-output-failed-commands.patch

debian/patches/u-ignoretest-ppc64el_02.patch

@@ -8,7 +8,7 @@ Bug: https://github.com/rust-lang/rust/issues/44670
  }
  
 +#[cfg(target_arch = "powerpc64")]
-+fn main() {} 
++fn main() {}
 +
 +#[cfg(not(target_arch = "powerpc64"))]
  fn main() {

debian/patches/u-ignoretest-ppc64el_03.patch

@@ -1,16 +0,0 @@
-Description: Ignore failing tests on ppc64el
- "ignore-powerpc64le" doesn't seem to work when I tested this.
-Author: Ximin Luo <infinity0@debian.org>
-Bug: https://github.com/rust-lang/rust/issues/44683
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=876134
-
---- a/src/test/run-pass/smallest-hello-world.rs
-+++ b/src/test/run-pass/smallest-hello-world.rs
-@@ -10,6 +10,7 @@
- 
- // Smallest "hello world" with a libc runtime
- 
-+// ignore-powerpc
- // ignore-windows
- // ignore-android
- 

debian/rules

@@ -50,7 +50,13 @@ DEB_CONFIGURE_FLAGS = --enable-llvm-link-shared --disable-dist-src --prefix=/usr
 # Use system LLVM (comment out to use vendored LLVM)
 LLVM_VERSION = 4.0
 OLD_LLVM_VERSION = 3.9
-DEB_CONFIGURE_FLAGS += --llvm-root=/usr/lib/llvm-$(LLVM_VERSION)
+# Make it easier to test against a custom LLVM
+ifneq (,$(LLVM_DESTDIR))
+LD_LIBRARY_PATH := $(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):$(LLVM_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH),$(LLVM_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH))
+export LD_LIBRARY_PATH
+endif
+DEB_CONFIGURE_FLAGS += --llvm-root=$(LLVM_DESTDIR)/usr/lib/llvm-$(LLVM_VERSION)
+
 RUSTBUILD = RUST_BACKTRACE=1 ./x.py
 RUSTBUILD_FLAGS = --config debian/config.toml -v --on-fail env
 # TODO: This should simply be "$(RUSTBUILD) test" but unfortunately this causes
@@ -160,6 +166,7 @@ debian/config.toml: debian/config.toml.in
 		-DDEB_HOST_RUST_TYPE="$(DEB_HOST_RUST_TYPE)" \
 		-DDEB_TARGET_RUST_TYPE="$(DEB_TARGET_RUST_TYPE)" \
 		-DRELEASE_CHANNEL="$(RELEASE_CHANNEL)" \
+		-DLLVM_DESTDIR="$(LLVM_DESTDIR)" \
 		-DLLVM_VERSION="$(LLVM_VERSION)" \
 		"$<" > "$@"