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

This commit is contained in:
Sylvestre Ledru 2022-01-08 10:30:46 +01:00
commit 0f32fe8804
2 changed files with 6 additions and 3 deletions

4
debian/changelog vendored
View File

@ -274,9 +274,9 @@ llvm-toolchain-snapshot (1:14~++20210715093511+afc760ef3527-1~exp2) unstable; ur
llvm-toolchain-13 (1:13.0.1~+rc1-1~exp4) experimental; urgency=medium llvm-toolchain-13 (1:13.0.1~+rc1-1~exp4) experimental; urgency=medium
* Fix the cmake with the mlir introducing * Fix the cmake file with the mlir introducing
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 03 Jan 2022 14:21:10 +0100 -- Sylvestre Ledru <sylvestre@debian.org> Thu, 06 Jan 2022 14:30:59 +0100
llvm-toolchain-13 (1:13.0.1~+rc1-1~exp3) experimental; urgency=medium llvm-toolchain-13 (1:13.0.1~+rc1-1~exp3) experimental; urgency=medium

5
debian/rules vendored
View File

@ -810,7 +810,10 @@ endif
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/include/llvm/Support/LICENSE.TXT rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/include/llvm/Support/LICENSE.TXT
# Disable CMake's package validation checks for target files that we may remove. # Disable CMake's package validation checks for target files that we may remove.
sed -i '/_IMPORT_CHECK_TARGETS \(Polly\|sancov\|llvm-omp-device-info\|mlir-tblgen\|omptarget\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake sed -i '/_IMPORT_CHECK_TARGETS \(Polly\|sancov\|llvm-omp-device-info\|omptarget\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake
# Also disable mlir-* checks in the cmake
sed -i '/_IMPORT_CHECK_TARGETS \(mlir-\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake
# Disable CMake's package validation checks for binaries that may not be installed # Disable CMake's package validation checks for binaries that may not be installed
sed -i 's|.*_IMPORT_CHECK_FILES_FOR_.*/bin/.*)|#&|' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake sed -i 's|.*_IMPORT_CHECK_FILES_FOR_.*/bin/.*)|#&|' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake