Unbreak the cmake tools

This commit is contained in:
Sylvestre Ledru 2024-07-28 20:30:38 +02:00
parent e0a41433c5
commit 9979ab1993
4 changed files with 11 additions and 3 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
llvm-toolchain-18 (1:18.1.8-7) unstable; urgency=medium
* Unbreak the cmake tools
-- Sylvestre Ledru <sylvestre@debian.org> 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)

View File

@ -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@/

View File

@ -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

3
debian/rules vendored
View File

@ -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