diff --git a/debian/changelog b/debian/changelog index 8fdf7a32..cfee09e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +llvm-toolchain-8 (1:8.0.1~+rc1-1~exp3) UNRELEASED; urgency=medium + + [ John Paul Adrian Glaubitz ] + * Use dh-exec to exclude lib/LLVM*.so on powerpc and + powerpcspe from llvm-X.Y-dev.install.in + + -- John Paul Adrian Glaubitz Sat, 25 May 2019 12:05:51 +0200 + llvm-toolchain-8 (1:8.0.1~+rc1-1~exp2) experimental; urgency=medium * Build using thinlto on non stretch, xenial and trusty diff --git a/debian/control b/debian/control index 3c2eeeb8..8c48a816 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils, ocaml-nox [amd64 arm64 armhf i386 ppc64el s390x], ocaml-findlib [amd64 arm64 armhf i386 ppc64el s390x], libctypes-ocaml-dev [amd64 arm64 armhf i386 ppc64el s390x], - dh-ocaml [amd64 arm64 armhf i386 ppc64el s390x], + dh-exec, dh-ocaml [amd64 arm64 armhf i386 ppc64el s390x], Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev Standards-Version: 4.2.1 Homepage: https://www.llvm.org/ diff --git a/debian/llvm-X.Y-dev.install.in b/debian/llvm-X.Y-dev.install.in index c08465de..9a4ca55a 100644 --- a/debian/llvm-X.Y-dev.install.in +++ b/debian/llvm-X.Y-dev.install.in @@ -1,6 +1,8 @@ +#!/usr/bin/dh-exec + usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM*.a #usr/lib/llvm-@LLVM_VERSION@/lib/libllvm*.a -usr/lib/llvm-@LLVM_VERSION@/lib/LLVM*.so +[!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVM*.so usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so diff --git a/debian/rules b/debian/rules index de5370f2..58b3d0a4 100755 --- a/debian/rules +++ b/debian/rules @@ -275,6 +275,9 @@ preconfigure: -e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $$f > $$f2; \ done + # Make install file executable for dh-exec + chmod +x debian/llvm-$(LLVM_VERSION)-dev.install + # Override this two targets. They are trying to manage the .in conversion for me override_dh_ocamlinit: override_dh_ocamlclean: