From 4b61e92a4a85a5de542d26eb75afe8000c624430 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Sat, 29 Aug 2020 17:48:30 +0200 Subject: [PATCH] Use dh-exec to exclude lib/libPolly*.a on powerpc and powerpcspe --- debian/changelog | 2 ++ debian/libclang-common-X.Y-dev.install.in | 4 +++- debian/rules | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 09ee4f9e..98353e76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ llvm-toolchain-11 (1:11.0.0~+rc2-5) UNRELEASED; urgency=medium [ John Paul Adrian Glaubitz ] * Link against libatomic on powerpc to fix FTBFS in stage2 + * Use dh-exec to exclude lib/libPolly*.a on powerpc and + powerpcspe from libclang-common-X.Y-dev.install.in -- John Paul Adrian Glaubitz Sat, 29 Aug 2020 15:11:20 +0200 diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in index f391eaf4..303ed2ca 100644 --- a/debian/libclang-common-X.Y-dev.install.in +++ b/debian/libclang-common-X.Y-dev.install.in @@ -1,7 +1,9 @@ +#!/usr/bin/dh-exec + usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/*.txt usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/share/*.txt -usr/lib/llvm-@LLVM_VERSION@/lib/libPolly*.a +[!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/libPolly*.a diff --git a/debian/rules b/debian/rules index 4f636b32..3942feb7 100755 --- a/debian/rules +++ b/debian/rules @@ -308,7 +308,7 @@ preconfigure: done # Make install file executable for dh-exec - chmod +x debian/llvm-$(LLVM_VERSION)-dev.install debian/clang-tools-$(LLVM_VERSION).install debian/libomp-$(LLVM_VERSION)-dev.install + chmod +x debian/llvm-$(LLVM_VERSION)-dev.install debian/libclang-common-$(LLVM_VERSION)-dev.install debian/clang-tools-$(LLVM_VERSION).install debian/libomp-$(LLVM_VERSION)-dev.install # DH doesn't support the [power ...] in install on Ubuntu trusty # fails with cp: cannot stat 'debian/tmp/[!powerpc': No such file or directory