From 60b3c83d93f7ac4a1c3af5f003ad3fcaf8307d8f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 13 Oct 2021 13:29:27 +0200 Subject: [PATCH] Instead of using llvm-* to install binaries in llvm-X.Y list all the binaries one by one. It will prevent "llvm-omp-device-info" to be installed in llvm-X.Y which caused an explicit dependency on libomp which caused llvm-X.Y to be NOT coinstallable anymore --- debian/changelog | 10 +++ debian/llvm-X.Y.install.in | 138 ++++++++++++++++++++++++++++++++++++- 2 files changed, 146 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9d315ce5..e6bd603f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +llvm-toolchain-13 (1:13.0.0-4) unstable; urgency=medium + + * Instead of using llvm-* to install binaries in llvm-X.Y + list all the binaries one by one. + It will prevent "llvm-omp-device-info" to be installed in + llvm-X.Y which caused an explicit dependency on libomp + which caused llvm-X.Y to be NOT coinstallable anymore + + -- + llvm-toolchain-13 (1:13.0.0-3) unstable; urgency=medium * libc++-13-dev should depends on libunwind-13-dev diff --git a/debian/llvm-X.Y.install.in b/debian/llvm-X.Y.install.in index dc67100a..163dfa1d 100644 --- a/debian/llvm-X.Y.install.in +++ b/debian/llvm-X.Y.install.in @@ -1,4 +1,73 @@ -usr/lib/llvm-@LLVM_VERSION@/bin/llvm-* +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-PerfectShuffle +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-ar +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-as +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-bcanalyzer +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-c-test +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-cat +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-cfi-verify +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-config +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-cov +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-cvtres +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-cxxdump +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-cxxfilt +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-cxxmap +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-diff +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-dis +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-dwarfdump +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-dwp +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-exegesis +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-extract +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-gsymutil +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-ifs +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-jitlink +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-jitlink-executor +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-libtool-darwin +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-link +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-lipo +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-lto +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-lto2 +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-mc +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-mca +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-ml +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-modextract +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-mt +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-nm +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-objcopy +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-objdump +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-device-info +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-opt-report +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-pdbutil +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-profdata +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-profgen +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-rc +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-readobj +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-reduce +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-rtdyld +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-sim +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-size +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-split +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-stress +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-strings +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-symbolizer +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-tapi-diff +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-tblgen +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-undname +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-xray +usr/lib/llvm-@LLVM_VERSION@/bin/obj2yaml +usr/lib/llvm-@LLVM_VERSION@/bin/opt +usr/lib/llvm-@LLVM_VERSION@/bin/sanstats +usr/lib/llvm-@LLVM_VERSION@/bin/verify-uselistorder +usr/lib/llvm-@LLVM_VERSION@/bin/yaml2obj +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-addr2line +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-bitcode-strip +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-dlltool +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-install-name-tool +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-lib +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-otool +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-ranlib +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-readelf +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-strip +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-windres usr/lib/llvm-@LLVM_VERSION@/bin/opt* usr/lib/llvm-@LLVM_VERSION@/bin/bugpoint* usr/lib/llvm-@LLVM_VERSION@/bin/llc* @@ -7,7 +76,72 @@ usr/lib/llvm-@LLVM_VERSION@/bin/yaml2obj usr/lib/llvm-@LLVM_VERSION@/bin/verify-uselistorder usr/lib/llvm-@LLVM_VERSION@/bin/sanstats usr/lib/llvm-@LLVM_VERSION@/bin/dsymutil -usr/bin/llvm-* + +usr/bin/llvm-PerfectShuffle-@LLVM_VERSION@ +usr/bin/llvm-addr2line-@LLVM_VERSION@ +usr/bin/llvm-ar-@LLVM_VERSION@ +usr/bin/llvm-as-@LLVM_VERSION@ +usr/bin/llvm-bcanalyzer-@LLVM_VERSION@ +usr/bin/llvm-bitcode-strip-@LLVM_VERSION@ +usr/bin/llvm-c-test-@LLVM_VERSION@ +usr/bin/llvm-cat-@LLVM_VERSION@ +usr/bin/llvm-cfi-verify-@LLVM_VERSION@ +usr/bin/llvm-config-@LLVM_VERSION@ +usr/bin/llvm-cov-@LLVM_VERSION@ +usr/bin/llvm-cvtres-@LLVM_VERSION@ +usr/bin/llvm-cxxdump-@LLVM_VERSION@ +usr/bin/llvm-cxxfilt-@LLVM_VERSION@ +usr/bin/llvm-cxxmap-@LLVM_VERSION@ +usr/bin/llvm-diff-@LLVM_VERSION@ +usr/bin/llvm-dis-@LLVM_VERSION@ +usr/bin/llvm-dlltool-@LLVM_VERSION@ +usr/bin/llvm-dwarfdump-@LLVM_VERSION@ +usr/bin/llvm-dwp-@LLVM_VERSION@ +usr/bin/llvm-exegesis-@LLVM_VERSION@ +usr/bin/llvm-extract-@LLVM_VERSION@ +usr/bin/llvm-gsymutil-@LLVM_VERSION@ +usr/bin/llvm-ifs-@LLVM_VERSION@ +usr/bin/llvm-install-name-tool-@LLVM_VERSION@ +usr/bin/llvm-jitlink-@LLVM_VERSION@ +usr/bin/llvm-jitlink-executor-@LLVM_VERSION@ +usr/bin/llvm-lib-@LLVM_VERSION@ +usr/bin/llvm-libtool-darwin-@LLVM_VERSION@ +usr/bin/llvm-link-@LLVM_VERSION@ +usr/bin/llvm-lipo-@LLVM_VERSION@ +usr/bin/llvm-lto-@LLVM_VERSION@ +usr/bin/llvm-lto2-@LLVM_VERSION@ +usr/bin/llvm-mc-@LLVM_VERSION@ +usr/bin/llvm-mca-@LLVM_VERSION@ +usr/bin/llvm-ml-@LLVM_VERSION@ +usr/bin/llvm-modextract-@LLVM_VERSION@ +usr/bin/llvm-mt-@LLVM_VERSION@ +usr/bin/llvm-nm-@LLVM_VERSION@ +usr/bin/llvm-objcopy-@LLVM_VERSION@ +usr/bin/llvm-objdump-@LLVM_VERSION@ +usr/bin/llvm-omp-device-info-@LLVM_VERSION@ +usr/bin/llvm-opt-report-@LLVM_VERSION@ +usr/bin/llvm-otool-@LLVM_VERSION@ +usr/bin/llvm-pdbutil-@LLVM_VERSION@ +usr/bin/llvm-profdata-@LLVM_VERSION@ +usr/bin/llvm-profgen-@LLVM_VERSION@ +usr/bin/llvm-ranlib-@LLVM_VERSION@ +usr/bin/llvm-rc-@LLVM_VERSION@ +usr/bin/llvm-readelf-@LLVM_VERSION@ +usr/bin/llvm-readobj-@LLVM_VERSION@ +usr/bin/llvm-reduce-@LLVM_VERSION@ +usr/bin/llvm-rtdyld-@LLVM_VERSION@ +usr/bin/llvm-sim-@LLVM_VERSION@ +usr/bin/llvm-size-@LLVM_VERSION@ +usr/bin/llvm-split-@LLVM_VERSION@ +usr/bin/llvm-stress-@LLVM_VERSION@ +usr/bin/llvm-strings-@LLVM_VERSION@ +usr/bin/llvm-strip-@LLVM_VERSION@ +usr/bin/llvm-symbolizer-@LLVM_VERSION@ +usr/bin/llvm-tapi-diff-@LLVM_VERSION@ +usr/bin/llvm-tblgen-@LLVM_VERSION@ +usr/bin/llvm-undname-@LLVM_VERSION@ +usr/bin/llvm-windres-@LLVM_VERSION@ +usr/bin/llvm-xray-@LLVM_VERSION@ usr/bin/opt* usr/bin/bugpoint* usr/bin/llc*