diff --git a/debian/changelog b/debian/changelog index 56da18c8..2adbaa3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,7 +18,8 @@ llvm-toolchain-18 (1:18.1.8-2~exp1) experimental; urgency=medium to move the libraries into multi archi directories * Bring back libLLVM to be installed in /usr/lib/llvm-18/lib/libLLVM-18.so instead of /usr/lib/llvm-18/lib/libLLVM.so - This should make the packages co installable again + Same for libclang (remove usr/lib/llvm-18/lib/libclang.so.1 + This should make the packages multiarch co installable again (Closes: #1067699, #1067005) (LP: #2063207) * Introduce the new variable @DEB_HOST_MULTIARCH_LLVM@ in the build system diff --git a/debian/libclang1-X.Y.links.in b/debian/libclang1-X.Y.links.in index 3ec0d6ac..db39da7a 100644 --- a/debian/libclang1-X.Y.links.in +++ b/debian/libclang1-X.Y.links.in @@ -1,6 +1,4 @@ # as upstream usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ -usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 -usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1 diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 5bffb0b0..156d0132 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -475,6 +475,12 @@ echo '#include int main() { }' > foo.cpp clang++-$VERSION -std=c++11 foo.cpp +if test -f /usr/lib/llvm-$VERSION/lib/libclang.so.1; then + echo "/usr/lib/llvm-$VERSION/lib/libclang.so.1 found." + echo "Break the build as it breaks the coinstalability" + exit 1 +fi + echo "Testing linking clang-cpp ..." clang-$VERSION -lclang-cpp$VERSION -v foo.cpp -o o &> /dev/null || true