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

Fix the libc++/libc++abi symlink issues after their moves in the triple directory

Browse Source
This commit is contained in:
Sylvestre Ledru 2021-09-27 12:12:19 +02:00
parent 72d3d9be01
commit d203ac3649
5 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -2,6 +2,7 @@ llvm-toolchain-snapshot (1:14~++20210926041028+6063e6b499c7-1~exp1) UNRELEASED;
* experimental New snapshot release * experimental New snapshot release
* Bring back the libc++/libc++abi options * Bring back the libc++/libc++abi options
* Fix the libc++/libc++abi symlink issues after their moves in the triple directory
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 26 Sep 2021 16:14:44 +0200 -- Sylvestre Ledru <sylvestre@debian.org> Sun, 26 Sep 2021 16:14:44 +0200

2
debian/libc++1-X.Y.links.in vendored
View File

@ -1,2 +1,2 @@
usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0 usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0
/usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1

2
debian/libc++abi-X.Y-dev.links.in vendored
View File

@ -1 +1 @@
usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH@/libc++abi.so /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so

2
debian/libc++abi1-X.Y.links.in vendored
View File

@ -1,2 +1,2 @@
usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0 usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0
/usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1

12
debian/rules vendored
View File

@ -829,6 +829,18 @@ override_dh_installdeb:
# Remove auto generated python pyc # Remove auto generated python pyc
find $(CURDIR)/debian/llvm-$(LLVM_VERSION)-tools/usr/lib/llvm-$(LLVM_VERSION)/ -name '*.pyc' | xargs -r rm -f find $(CURDIR)/debian/llvm-$(LLVM_VERSION)-tools/usr/lib/llvm-$(LLVM_VERSION)/ -name '*.pyc' | xargs -r rm -f
# Symlink the weird llvm triple to Debian's
# I know it is ugly but I cannot use debian dh_links as I don't know what
# will be the llvm triple on other archs
T=$(shell grep LLVM_HOST_TRIPLE $(CURDIR)/debian/llvm-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMConfig.cmake|cut -d\" -f2); \
echo "triple = $$T"; \
cd $(CURDIR)/debian/libc++abi1-$(LLVM_VERSION)/usr/lib/llvm-$(LLVM_VERSION)/lib/; \
ln -s $$T $(DEB_HOST_MULTIARCH); \
cd - && cd $(CURDIR)/debian/libunwind-$(LLVM_VERSION)/usr/lib/llvm-$(LLVM_VERSION)/lib/; \
ln -s $$T $(DEB_HOST_MULTIARCH)
ifeq (${RUN_TEST},yes) ifeq (${RUN_TEST},yes)
# List of the archs we know we have 100 % tests working # List of the archs we know we have 100 % tests working
ARCH_LLVM_TEST_OK := i386 amd64 ARCH_LLVM_TEST_OK := i386 amd64