From 04d9ffab1627de0ed9b10c34577158dbb5fb8d3e Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 25 Feb 2020 15:15:42 +0100 Subject: [PATCH] Don't install stuff where not built (e.g. libarcher on armhf or hwasan on sparc64) --- debian/clang-tools-X.Y.install.in | 2 +- debian/libomp-X.Y-dev.install.in | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in index 9fb8aaba..b15f6577 100644 --- a/debian/clang-tools-X.Y.install.in +++ b/debian/clang-tools-X.Y.install.in @@ -33,7 +33,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/pp-trace usr/lib/llvm-@LLVM_VERSION@/bin/clang-move usr/lib/llvm-@LLVM_VERSION@/bin/clang-offload-wrapper -[!armel !armhf !ppc64el !hurd-any !s390x !powerpc !ppc64 !mipsel !mips64el !riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/bin/hwasan_symbolize +[!armel !armhf !ppc64el !hurd-any !s390x !powerpc !ppc64 !mipsel !mips64el !sparc64 !riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/bin/hwasan_symbolize clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/ clang/tools/scan-build-py-@LLVM_VERSION@ usr/share/clang/ diff --git a/debian/libomp-X.Y-dev.install.in b/debian/libomp-X.Y-dev.install.in index ccb04568..9255b828 100644 --- a/debian/libomp-X.Y-dev.install.in +++ b/debian/libomp-X.Y-dev.install.in @@ -1,6 +1,8 @@ +#!/usr/bin/dh-exec + /usr/lib/llvm-@LLVM_VERSION@/include/openmp/omp*.h /usr/lib/llvm-@LLVM_VERSION@/lib/libgomp.so /usr/lib/llvm-@LLVM_VERSION@/lib/libiomp5.so /usr/lib/llvm-@LLVM_VERSION@/lib/libomp*.so -/usr/lib/llvm-@LLVM_VERSION@/lib/libarcher_static.a -/usr/lib/llvm-@LLVM_VERSION@/lib/libarcher.so +[!armhf !mips64el] /usr/lib/llvm-@LLVM_VERSION@/lib/libarcher_static.a +[!armhf !mips64el] /usr/lib/llvm-@LLVM_VERSION@/lib/libarcher.so