Merge remote-tracking branch 'origin/7' into snapshot

debian/NEWS

@@ -1,7 +1,7 @@
 llvm-toolchain-7 (1:7-1) unstable; urgency=medium
 
   * From version 7, llvm-toolchain also provides libc++, libc++abi
-    and OpenMP packages
+    and OpenMP packages. Non-coinstallable on purpose.
   * Packages, binaries and libraries have been renamed.
     Instead of the X.Y naming, we moved to X to match the
     naming from upstream.

debian/changelog

@@ -2,6 +2,14 @@ llvm-toolchain-snapshot (1:8~svn342269-2) UNRELEASED; urgency=medium
 
   * Fix the ftbfs under armel on libc++ and enable openmp on armel.
     Thanks to Adrian Bunk for the patch
+  * Make libc++, libc++abi & openmp NOT co-installable
+    Rational: the benefits are limited compared to the drawback.
+    We should have issues like:
+       - built with libc++-8-dev
+       - run with libc++1-7
+    (Closes: #903802)
+  * Remove circular dependency by removing python-lldb-7: Depends: liblldb-7-dev
+    (Closes: #888889)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 19 Sep 2018 15:53:51 +0200
 

debian/qualify-clang.sh

@@ -187,7 +187,7 @@ if test ! -f /usr/lib/llvm-$VERSION/lib/libomp.so; then
 fi
 
 # OpenMP
-echo '
+cat <<EOF > foo.c
 //test.c
 #include "omp.h"
 #include <stdio.h>
@@ -196,7 +196,7 @@ int main(void) {
   #pragma omp parallel
   printf("thread %d\n", omp_get_thread_num());
 }
-' > foo.c
+EOF
 clang-$VERSION foo.c -fopenmp -o o
 ./o > /dev/null