proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-08-03 21:36:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sylvestre Ledru 2024-07-03 23:08:50 +02:00
parent 9b1f6b3775
commit 05d61700e9
7 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

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

4
debian/libllvmX.Y.install.in vendored
View File

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

8
debian/libllvmX.Y.links.in vendored
View File

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

1
debian/llvm-X.Y-dev.install.in vendored
View File

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

4
debian/llvm-X.Y-dev.links.in vendored
View File

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

16
debian/patches/rename-libllvm.diff vendored Normal file
View File

@ -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} $<TARGET_FILE_NAME:LLVM> SHARED FULL_DEST COMPONENT LLVM)
endif()

1
debian/patches/series vendored
View File

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