From 9979ab1993b901853b00580b89751b51a3743722 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 28 Jul 2024 20:30:38 +0200 Subject: [PATCH] Unbreak the cmake tools --- debian/changelog | 6 ++++++ debian/llvm-X.Y-dev.install.in | 1 + debian/qualify-clang.sh | 4 ++-- debian/rules | 3 ++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a098b20b..8afd73c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-18 (1:18.1.8-7) unstable; urgency=medium + + * Unbreak the cmake tools + + -- Sylvestre Ledru Sun, 28 Jul 2024 09:49:06 +0200 + llvm-toolchain-18 (1:18.1.8-6) unstable; urgency=medium * Make libllvm multi arch ready again ... (Closes: #1076131) diff --git a/debian/llvm-X.Y-dev.install.in b/debian/llvm-X.Y-dev.install.in index d87daf09..1728cc90 100644 --- a/debian/llvm-X.Y-dev.install.in +++ b/debian/llvm-X.Y-dev.install.in @@ -3,6 +3,7 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM*.a #usr/lib/llvm-@LLVM_VERSION@/lib/libllvm*.a usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@*.so +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@*.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so usr/lib/llvm-@LLVM_VERSION@/lib/libRemarks.* usr/lib/llvm-@LLVM_VERSION@/include/llvm/ usr/include/llvm-@LLVM_VERSION@/ diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index cb7a2368..642792a3 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -33,12 +33,12 @@ fi # allow usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@*.so # as it is in llvm-X.Y-dev NBLINES=$(ls -1 /usr/lib/llvm-$VERSION/lib/libLLVM*.so*|wc -l) -if test $NBLINES -ne 1; then +if test $NBLINES -ne 2; then echo "Found some libLLVM into /usr/lib/llvm-$VERSION/lib/" echo "See:" ls -al /usr/lib/llvm-$VERSION/lib/libLLVM*.so* echo "Break the build as it breaks the coinstalability" - echo "we should have only one for llvm-X.Y-dev" + echo "we should have only two for llvm-X.Y-dev" exit 1 fi diff --git a/debian/rules b/debian/rules index 6070febe..f1215c35 100755 --- a/debian/rules +++ b/debian/rules @@ -1176,7 +1176,8 @@ override_dh_auto_install: rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so cd $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/; \ - ln -s ../../$(DEB_HOST_MULTIARCH)/libLLVM-$(LLVM_VERSION).so.1 libLLVM-$(LLVM_VERSION).so + ln -s ../../$(DEB_HOST_MULTIARCH)/libLLVM-$(LLVM_VERSION).so.1 libLLVM-$(LLVM_VERSION).so; \ + ln -s ../../$(DEB_HOST_MULTIARCH)/libLLVM-$(LLVM_VERSION).so.1 libLLVM-$(LLVM_VERSION).so.1 # Not used on Linux. rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/argdumper