the openmp header files moved to the same path as lib clang headers.

To make sure they aren't conflicting ( https://bugs.llvm.org/show_bug.cgi?id=46977 )
Remove them from the libclang-common package
This commit is contained in:
Sylvestre Ledru 2020-08-04 12:22:26 +02:00
parent cc416c924e
commit 7ab8ed5718
2 changed files with 8 additions and 3 deletions

6
debian/changelog vendored
View File

@ -1,9 +1,9 @@
llvm-toolchain-snapshot (1:12~++20200729055134+a4ade9ed21e-1~exp1) UNRELEASED; urgency=medium llvm-toolchain-snapshot (1:12~++20200803010113+d1007478f19-1~exp1) UNRELEASED; urgency=medium
* Install omp.h in instead of +/usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/include/ * Install omp.h in instead of /usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/include/
instead of /usr/lib/llvm-@LLVM_VERSION@/include/openmp/omp instead of /usr/lib/llvm-@LLVM_VERSION@/include/openmp/omp
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 29 Jul 2020 17:55:09 +0200 -- Sylvestre Ledru <sylvestre@debian.org> Mon, 03 Aug 2020 13:04:50 +0200
llvm-toolchain-snapshot (1:12~++20200715052739+d6e79e3dd6d-1~exp1) experimental; urgency=medium llvm-toolchain-snapshot (1:12~++20200715052739+d6e79e3dd6d-1~exp1) experimental; urgency=medium

5
debian/rules vendored
View File

@ -780,6 +780,11 @@ override_dh_installdeb:
rm -f $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/__init__.pyc $(CURDIR)/debian/python*-lldb-$(LLVM_VERSION)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/__init__.pyc rm -f $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/__init__.pyc $(CURDIR)/debian/python*-lldb-$(LLVM_VERSION)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/__init__.pyc
rm -f $(CURDIR)/debian/clang-$(LLVM_VERSION)-examples/usr/share/doc/clang-$(LLVM_VERSION)-examples/examples/*Make* rm -f $(CURDIR)/debian/clang-$(LLVM_VERSION)-examples/usr/share/doc/clang-$(LLVM_VERSION)-examples/examples/*Make*
# the openmp header files moved to the same path as lib clang headers.
# To make sure they aren't conflicting ( https://bugs.llvm.org/show_bug.cgi?id=46977 )
# 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 auto generated python pyc # Remove auto generated python pyc
find $(CURDIR)/debian/llvm-$(LLVM_VERSION)-tools/usr/lib/llvm-$(LLVM_VERSION)/ -name '*.pyc' | xargs -r rm -f find $(CURDIR)/debian/llvm-$(LLVM_VERSION)-tools/usr/lib/llvm-$(LLVM_VERSION)/ -name '*.pyc' | xargs -r rm -f