From 4e78d353dc794a52bc55be9d30d04a49acefe2fb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 29 Sep 2020 21:04:18 +0200 Subject: [PATCH] Fix "libc++-11-dev includes libc++abi-11-dev headers" (Closes: #969274) --- debian/changelog | 7 +++++++ debian/rules | 2 ++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6601ae57..03ce889c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,13 @@ llvm-toolchain-snapshot (1:12~++20200715052739+d6e79e3dd6d-1~exp1) experimental; -- Sylvestre Ledru Wed, 08 Jul 2020 15:19:14 +0200 +llvm-toolchain-11 (1:11.0.0~+rc2-6) unstable; urgency=medium + + * Fix "libc++-11-dev includes libc++abi-11-dev headers" + (Closes: #969274) + + -- Sylvestre Ledru Mon, 07 Sep 2020 13:32:26 +0200 + llvm-toolchain-11 (1:11.0.0~+rc2-5) unstable; urgency=medium [ John Paul Adrian Glaubitz ] diff --git a/debian/rules b/debian/rules index 8c329ca5..939dc266 100755 --- a/debian/rules +++ b/debian/rules @@ -786,6 +786,8 @@ override_dh_installdeb: # Remove them from the libclang-common package rm -f $(CURDIR)/debian/libclang-common-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION_FULL)/include/omp*.h +# Remove some libc++ abi files in the libc++ file. See bug #969274 + rm -f $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/include/c++/__cxxabi_config.h $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/include/c++/cxxabi.h # Remove auto generated python pyc find $(CURDIR)/debian/llvm-$(LLVM_VERSION)-tools/usr/lib/llvm-$(LLVM_VERSION)/ -name '*.pyc' | xargs -r rm -f