Also path LD_LIBRARY_PATH for install when cmake binary backport like on bionic s390x (for apt.llvm.org)

This commit is contained in:
Sylvestre Ledru 2022-02-14 21:19:02 +01:00
parent b663060998
commit 994a314a62
2 changed files with 4 additions and 7 deletions

9
debian/changelog vendored
View File

@ -14,13 +14,10 @@ llvm-toolchain-snapshot (1:15~++20220202093833+1a3137dc8451-1~exp2) unstable; ur
llvm-toolchain-14 (1:14.0.0~+rc1-2) unstable; urgency=medium
* Also install usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexProto.a
usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexServiceProto.a
usr/lib/llvm-@LLVM_VERSION@/lib/libMonitoringServiceProto.a
in libclang-X.Y-dev
(Closes: #1005666)
* Also path LD_LIBRARY_PATH for install
when cmake binary backport like on bionic s390x (for apt.llvm.org)
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 13 Feb 2022 14:17:02 +0100
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 14 Feb 2022 21:19:44 +0100
llvm-toolchain-14 (1:14.0.0~+rc1-1) unstable; urgency=medium

2
debian/rules vendored
View File

@ -733,7 +733,7 @@ override_dh_auto_install:
# Clean up temporary files to make sure the install works
rm -rf $(find $(TARGET_BUILD) -wholename '*CMakeFiles*' -not -name CMakeLists.txt -a -name "*.dir" -type d)
# install/fast enables a make install without recompiling temporary files
LD_LIBRARY_PATH=$(STAGE_2_LIB_DIR) 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
# Not used on Linux.
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/argdumper