Merge remote-tracking branch 'origin/13' into snapshot

This commit is contained in:
Sylvestre Ledru 2021-08-19 21:57:29 +02:00
commit 7aabc821f2
2 changed files with 3 additions and 2 deletions

1
debian/changelog vendored
View File

@ -41,6 +41,7 @@ llvm-toolchain-13 (1:13~++20210731010128+6eaf46beb462-1~exp1) experimental; urge
- for now, I am not planning to rename libclang1-13 to libclang13 as it will - for now, I am not planning to rename libclang1-13 to libclang13 as it will
cause too much churn for a small gain as we will keep libllvm (while cause too much churn for a small gain as we will keep libllvm (while
losing the capability to have different versions in parallel installed) losing the capability to have different versions in parallel installed)
See upstream c7b3a91017d26266d7556b1ac7c49b06f0109b91
-- Sylvestre Ledru <sylvestre@debian.org> Tue, 20 Jul 2021 09:40:58 +0200 -- Sylvestre Ledru <sylvestre@debian.org> Tue, 20 Jul 2021 09:40:58 +0200

4
debian/rules vendored
View File

@ -625,8 +625,8 @@ override_dh_auto_install:
: # libclang : # libclang
cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && \ cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && \
ln -s libclang-$(SONAME_CLANG).so libclang.so.$(SONAME_EXT) && \ ln -s libclang-$(LLVM_VERSION).so libclang.so.$(SONAME_EXT) && \
ln -s libclang-$(SONAME_CLANG).so libclang-$(SONAME_CLANG).so.$(SONAME_EXT) ln -s libclang-$(LLVM_VERSION).so libclang-$(SONAME_CLANG).so.$(SONAME_EXT)
: # libomp : # libomp
cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib && rm -f libomp.so; \ cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib && rm -f libomp.so; \