proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-08-14 10:00:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixup polly fix from 7 and snapshot branches

Browse Source
This commit is contained in:
Gianfranco Costamagna 2018-09-12 16:22:44 +02:00
parent b430434c8d
commit a389f38db4
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -3,6 +3,9 @@ llvm-toolchain-6.0 (1:6.0.1-8) UNRELEASED; urgency=medium
[ John Paul Adrian Glaubitz ] [ John Paul Adrian Glaubitz ]
* Fix inverted logic in ifeq statement for POLLY_ENABLE (Closes: #908646) * 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 <glaubitz@physik.fu-berlin.de> Wed, 12 Sep 2018 10:48:35 +0200 -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Wed, 12 Sep 2018 10:48:35 +0200
llvm-toolchain-6.0 (1:6.0.1-7) unstable; urgency=medium llvm-toolchain-6.0 (1:6.0.1-7) unstable; urgency=medium

1
debian/libclang-common-X.Y-dev.install.in vendored
View File

@ -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@/lib
usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/*.txt 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@/lib /usr/lib/clang/@LLVM_VERSION@/
#usr/lib/clang/@LLVM_VERSION_FULL@/include/ /usr/include/clang/@LLVM_VERSION@/ #usr/lib/clang/@LLVM_VERSION_FULL@/include/ /usr/include/clang/@LLVM_VERSION@/

7
debian/rules vendored
View File

@ -96,7 +96,7 @@ endif
# Enable polly (or not) # Enable polly (or not)
POLLY_ENABLE=yes POLLY_ENABLE=yes
ifneq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe s390x)) ifneq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe))
POLLY_ENABLE=no POLLY_ENABLE=no
endif 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; \ 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) 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 \ # 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; \ # 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 # fi
@ -517,6 +517,9 @@ endif
override_dh_install: 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) # 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 dh_install --fail-missing
override_dh_installdeb: override_dh_installdeb: