Fix more LLVM versions and add a strict check for it

diff --git a/debian/patches/dynamic-link-llvm_1.13.patch b/debian/patches/dynamic-link-llvm_1.13.patch
index 9a68924e6f7f0f502980b28c0544c194690d5232..9ef5a430f68d1967ca50cb8d232ca391579ee410 100644 (file)
--- a/debian/patches/dynamic-link-llvm_1.13.patch
+++ b/debian/patches/dynamic-link-llvm_1.13.patch
@@ -62,7 +62,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +    // Link in all LLVM libraries
 +    // Link in Debian full LLVM shared library.
 +    // TODO: not sure what to do in the cross-compiling case.
-+    println!("cargo:rustc-link-lib={}={}", "dylib", "LLVM-3.8");
++    println!("cargo:rustc-link-lib={}={}", "dylib", "LLVM-3.9");
  
      // LLVM ldflags
      //
@@ -107,7 +107,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -    f.write(")]\n")
 +# Link in Debian full LLVM shared library.
 +# TODO: not sure what to do in the cross-compiling case.
-+f.write("#[link(name = \"LLVM-3.8\")]\n")
++f.write("#[link(name = \"LLVM-3.9\")]\n")
  
  # LLVM ldflags
  out = run([llvm_config, '--ldflags'])

diff --git a/debian/patches/ignore-failing-armhf-tests_03.patch b/debian/patches/ignore-failing-armhf-tests_03.patch
index 63e8c5502b83f9941c18fc965b3cd7293a52fa0c..2717a99991575ae5dce1ecc5d9103a083812d9ce 100644 (file)
--- a/debian/patches/ignore-failing-armhf-tests_03.patch
+++ b/debian/patches/ignore-failing-armhf-tests_03.patch
@@ -3,11 +3,11 @@ Description: Disable reference.md "Items_and_attributes_14" doctest, hanging on
  .
  See https://gist.github.com/infinity0/2f5452d4ee9deb2f1bacb8b39c987c9c
  for thread stacktrace during the hang; eddyb from #rustc suggests this might
- be an LLVM issue. Unsure if this is Debian-specific; we should re-enable this
- test again when we move to LLVM-3.8 (what Rust upstream is using) and if it
+ be an LLVM issue. This might be updated with our newer Debian LLVM versions;
+ we should try to re-enable this test again when we switch on armhf again.
  still occurs then file a bug upstream.
 Author: Ximin Luo <infinity0@debian.org>
-Bug: TODO pending LLVM-3.8 switch
+Bug: TODO pending enabling armhf in Debian
 Forwarded: not-needed
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/

diff --git a/debian/rules b/debian/rules
index 1ad5e92c01254f5a2392880daeddecf0a5c47ea5..4f049aed6f94d2b0d587264049627c6863bd4414 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -52,6 +52,7 @@ DEB_CONFIGURE_FLAGS = \
                --prefix=/usr
 
 # Use system LLVM (comment out to use vendored LLVM)
+OLD_LLVM_VERSION = 3.8
 DEB_CONFIGURE_FLAGS += --llvm-root=/usr/lib/llvm-3.9
 
 # Below we detect how we're supposed to bootstrap the stage0 compiler. See
@@ -106,6 +107,8 @@ endif
 
 # Note: SHELL is not set by dash, but the configure script wants to use it
 override_dh_auto_configure:
+       # fail the build if we have any instances of OLD_LLVM_VERSION in debian, except for debian/changelog
+       ! grep --color=always -i 'll...$(OLD_LLVM_VERSION)' --exclude=changelog -R debian
        $(PRECONFIGURE_CHECK)
        SHELL=/bin/sh PATH="$$PWD/debian/bin:$$PATH" DEB_HOST_ARCH="$(DEB_HOST_ARCH)" \
            ./configure $(DEB_CONFIGURE_FLAGS)