From a389f38db45fc583ade823d105567f7862b23a5f Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Wed, 12 Sep 2018 16:22:44 +0200 Subject: [PATCH] Fixup polly fix from 7 and snapshot branches --- debian/changelog | 3 +++ debian/libclang-common-X.Y-dev.install.in | 1 - debian/rules | 7 +++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 126aaeb0..75f09bfa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ llvm-toolchain-6.0 (1:6.0.1-8) UNRELEASED; urgency=medium [ John Paul Adrian Glaubitz ] * Fix inverted logic in ifeq statement for POLLY_ENABLE (Closes: #908646) + [ Gianfranco Costamagna ] + * Fixup the polly installation failure where polly is not built + -- John Paul Adrian Glaubitz Wed, 12 Sep 2018 10:48:35 +0200 llvm-toolchain-6.0 (1:6.0.1-7) unstable; urgency=medium diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in index 59ed5dfc..17b24297 100644 --- a/debian/libclang-common-X.Y-dev.install.in +++ b/debian/libclang-common-X.Y-dev.install.in @@ -2,7 +2,6 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/include usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/lib usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/*.txt -usr/lib/llvm-@LLVM_VERSION@/lib/cmake/polly/*.cmake #usr/lib/clang/@LLVM_VERSION_FULL@/lib /usr/lib/clang/@LLVM_VERSION@/ #usr/lib/clang/@LLVM_VERSION_FULL@/include/ /usr/include/clang/@LLVM_VERSION@/ diff --git a/debian/rules b/debian/rules index 4d5c5755..ac61565b 100755 --- a/debian/rules +++ b/debian/rules @@ -96,7 +96,7 @@ endif # Enable polly (or not) POLLY_ENABLE=yes -ifneq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe s390x)) +ifneq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe)) POLLY_ENABLE=no endif @@ -367,7 +367,7 @@ override_dh_auto_install: cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && rm -f libclang.so.$(SONAME_EXT) libclang-$(LLVM_VERSION).so; \ ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang.so.$(SONAME_EXT) -# Remove artefact (where compiler-rt is built) +# Remove artifact (where compiler-rt is built) # if test -d $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/clang_linux; then \ # cd $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/clang_linux && rm -rf $$(find . -mindepth 2 -maxdepth 2 -type d) && rm -rf $$(find -empty) && rm -rf */.dir; \ # fi @@ -517,6 +517,9 @@ endif override_dh_install: # cp $(TARGET_BUILD)/lib/libLLVM-$(LLVM_VERSION).so $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT) +ifeq (${POLLY_ENABLE},yes) + dh_install -p libclang-common-$(LLVM_VERSION)-dev usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly +endif dh_install --fail-missing override_dh_installdeb: