proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-07-27 20:24:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make libllvm co-installable again (Closes: #1076131)

Browse Source
This commit is contained in:
Sylvestre Ledru 2024-07-15 12:30:45 +02:00
parent b3fc2e2269
commit ac3b67c192
5 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,15 +1,20 @@
llvm-toolchain-18 (1:18.1.8-3) UNRELEASED; urgency=medium llvm-toolchain-18 (1:18.1.8-4) UNRELEASED; urgency=medium
[ Matthias Klose ] [ Matthias Klose ]
* Construct the --package-metadata option just from ELF_PACKAGE_METADATA. * Construct the --package-metadata option just from ELF_PACKAGE_METADATA.
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 15 Jul 2024 12:30:36 +0200
llvm-toolchain-18 (1:18.1.8-3) unstable; urgency=medium
[ Sylvestre Ledru ] [ Sylvestre Ledru ]
* Revert LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON * Revert LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
9ca35f30383d89e4fdd45d15e0eb82c832df4b8c 9ca35f30383d89e4fdd45d15e0eb82c832df4b8c
For causing https://github.com/llvm/llvm-project/issues/96210 For causing https://github.com/llvm/llvm-project/issues/96210
* Disable LLDB_BUILD_INTEL_PT on Ubuntu bionic * Disable LLDB_BUILD_INTEL_PT on Ubuntu bionic
* Make libllvm co-installable again (Closes: #1076131)
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 13 Jul 2024 10:26:40 +0200 -- Sylvestre Ledru <sylvestre@debian.org> Mon, 15 Jul 2024 09:49:47 +0200
llvm-toolchain-18 (1:18.1.8-2) unstable; urgency=medium llvm-toolchain-18 (1:18.1.8-2) unstable; urgency=medium

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

@ -1,2 +1,2 @@
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.@LLVM_VERSION@.1 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.@LLVM_VERSION@.1

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

@ -1,5 +1,4 @@
usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so # Should be uncommented for @LLVM_VERSION@.1 and other
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.1
usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so usr/lib/@DEB_HOST_MULTIARCH@/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

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

@ -1,5 +1,8 @@
usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so usr/lib/@DEB_HOST_MULTIARCH@/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/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-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so.1
usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so
usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1
usr/include/llvm-c-@LLVM_VERSION@/llvm-c usr/lib/llvm-@LLVM_VERSION@/include/llvm-c 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 usr/include/llvm-@LLVM_VERSION@/llvm usr/lib/llvm-@LLVM_VERSION@/include/llvm

5
debian/rules vendored
View File

@ -1167,6 +1167,11 @@ override_dh_auto_install:
# install/fast enables a make install without recompiling temporary files # install/fast enables a make install without recompiling temporary files
LD_LIBRARY_PATH=$(STAGE_2_LIB_DIR):$$LD_LIBRARY_PATH DESTDIR=$(DEB_INST)/ ninja -C $(TARGET_BUILD) $(VERBOSE) stage2-install LD_LIBRARY_PATH=$(STAGE_2_LIB_DIR):$$LD_LIBRARY_PATH DESTDIR=$(DEB_INST)/ ninja -C $(TARGET_BUILD) $(VERBOSE) stage2-install
# Move libLLVM to /usr/lib/TRIPLE/libLLVM-XX.so.1 to make it multiarch ready
mkdir -p $(DEB_INST)/usr/lib/$(DEB_HOST_MULTIARCH)/; \
mv $(DEB_INST)/usr/lib/llvm-18/lib/libLLVM-$(LLVM_VERSION).so.1 $(DEB_INST)/usr/lib/$(DEB_HOST_MULTIARCH)/; \
mv $(DEB_INST)/usr/lib/llvm-18/lib/libLLVM-$(LLVM_VERSION).so.$(LLVM_VERSION).1 $(DEB_INST)/usr/lib/$(DEB_HOST_MULTIARCH)/
# Not used on Linux. # Not used on Linux.
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/argdumper rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/argdumper
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/clang/clang-format-bbedit.applescript rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/clang/clang-format-bbedit.applescript