diff --git a/debian/changelog b/debian/changelog index 3f7428b6..56da18c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,9 @@ llvm-toolchain-18 (1:18.1.8-2~exp1) experimental; urgency=medium [ Sylvestre Ledru ] * Enable LLVM_ENABLE_PER_TARGET_RUNTIME_DIR 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 (Closes: #1067699, #1067005) (LP: #2063207) * Introduce the new variable @DEB_HOST_MULTIARCH_LLVM@ in the build system diff --git a/debian/libllvmX.Y.install.in b/debian/libllvmX.Y.install.in index ebdeb0a0..27847582 100644 --- a/debian/libllvmX.Y.install.in +++ b/debian/libllvmX.Y.install.in @@ -1,2 +1,2 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.1 +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.@LLVM_VERSION@.1 diff --git a/debian/libllvmX.Y.links.in b/debian/libllvmX.Y.links.in index 6c7bfa20..298e0871 100644 --- a/debian/libllvmX.Y.links.in +++ b/debian/libllvmX.Y.links.in @@ -1,5 +1,5 @@ usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 /usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.1 -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.1 +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.1 +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.1 diff --git a/debian/llvm-X.Y-dev.install.in b/debian/llvm-X.Y-dev.install.in index d5c7a3c2..d87daf09 100644 --- a/debian/llvm-X.Y-dev.install.in +++ b/debian/llvm-X.Y-dev.install.in @@ -2,7 +2,6 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM*.a #usr/lib/llvm-@LLVM_VERSION@/lib/libllvm*.a -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@*.so usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so usr/lib/llvm-@LLVM_VERSION@/lib/libRemarks.* diff --git a/debian/llvm-X.Y-dev.links.in b/debian/llvm-X.Y-dev.links.in index 90e99374..d57fd6f3 100644 --- a/debian/llvm-X.Y-dev.links.in +++ b/debian/llvm-X.Y-dev.links.in @@ -1,5 +1,5 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 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/libLLVM-@LLVM_VERSION_FULL@.so usr/include/llvm-c-@LLVM_VERSION@/llvm-c usr/lib/llvm-@LLVM_VERSION@/include/llvm-c usr/include/llvm-@LLVM_VERSION@/llvm usr/lib/llvm-@LLVM_VERSION@/include/llvm diff --git a/debian/patches/rename-libllvm.diff b/debian/patches/rename-libllvm.diff new file mode 100644 index 00000000..f1b6cb5e --- /dev/null +++ b/debian/patches/rename-libllvm.diff @@ -0,0 +1,16 @@ +Index: llvm-toolchain-18-18.1.8/llvm/tools/llvm-shlib/CMakeLists.txt +=================================================================== +--- llvm-toolchain-18-18.1.8.orig/llvm/tools/llvm-shlib/CMakeLists.txt ++++ llvm-toolchain-18-18.1.8/llvm/tools/llvm-shlib/CMakeLists.txt +@@ -36,8 +36,10 @@ if(LLVM_BUILD_LLVM_DYLIB) + if (WIN32) + add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES}) + else() +- add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB OUTPUT_NAME LLVM ${INSTALL_WITH_TOOLCHAIN} ${SOURCES}) ++ message(STATUS "lib name = LLVM-${LLVM_VERSION_MAJOR}") ++ add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB OUTPUT_NAME LLVM-${LLVM_VERSION_MAJOR} ${INSTALL_WITH_TOOLCHAIN} ${SOURCES}) + # Add symlink for backwards compatibility with old library name ++ message(STATUS "foo = $(LLVM-${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX}") + llvm_install_library_symlink(LLVM-${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX} $ SHARED FULL_DEST COMPONENT LLVM) + endif() + diff --git a/debian/patches/series b/debian/patches/series index 8892db2c..ea23143a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -152,3 +152,4 @@ mips/D154390-pre-R6.diff libsanitizer-timebits.diff ubuntu-releases.patch clang-record-gcc-switches-by-default.patch +rename-libllvm.diff