From 4b21480b15d2055ef9adf2744c3b7dfb993a91a8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 19 Sep 2018 15:54:41 +0200 Subject: [PATCH 1/5] mark as unreleased --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d4ae9722..c54b78f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-7 (1:7-2) unstable; urgency=medium +llvm-toolchain-7 (1:7-2) UNRELEASED; urgency=medium * Fix the ftbfs under armel on libc++ and enable openmp on armel. Thanks to Adrian Bunk for the patch From f260dc53710daca70718c1aa384ccf4e9d81e206 Mon Sep 17 00:00:00 2001 From: Reshabh Sharma Date: Wed, 19 Sep 2018 16:05:00 +0000 Subject: [PATCH 2/5] Fix OpenMP test failing at ci.debian.net --- debian/qualify-clang.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index d2f983c6..6dbd33a7 100644 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -180,7 +180,7 @@ if test ! -f /usr/lib/llvm-$VERSION/lib/libomp.so; then fi # OpenMP -echo ' +cat < foo.c //test.c #include "omp.h" #include @@ -189,7 +189,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 From 84dbf9db414d956d4708c8da1bc4628c5a984690 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 20 Sep 2018 11:13:13 +0200 Subject: [PATCH 3/5] Non-coinstallable info added in NEWS --- debian/NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/NEWS b/debian/NEWS index 63cd553a..087e0b3d 100644 --- a/debian/NEWS +++ b/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. From 6f763dc60e50da827ac4ff2c382ce8969572aacd Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 20 Sep 2018 11:49:56 +0200 Subject: [PATCH 4/5] * 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) --- debian/changelog | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c54b78f3..47b12d30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,13 @@ -llvm-toolchain-7 (1:7-2) UNRELEASED; urgency=medium +llvm-toolchain-7 (1:7-2) unstable; 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) -- Sylvestre Ledru Wed, 19 Sep 2018 14:12:34 +0200 From b14f25e53524c2ec04abc351d551df21b030acd1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 20 Sep 2018 11:51:32 +0200 Subject: [PATCH 5/5] Remove circular dependency by removing python-lldb-7: Depends: liblldb-7-dev (Closes: #888889) --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 47b12d30..3bcac679 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ llvm-toolchain-7 (1:7-2) unstable; urgency=medium - 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 Wed, 19 Sep 2018 14:12:34 +0200