From 24cd1284b37711e5882213760242da0ce31bbb55 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 3 Sep 2024 14:57:33 +0200 Subject: [PATCH] Remove the cmake dependency on libLibcTableGenUtil.a see https://github.com/llvm/llvm-project/issues/99819 --- debian/changelog | 7 ++++++- debian/rules | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5baaa6d2..78bcb1d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,17 @@ llvm-toolchain-19 (1:19.1.0~++rc3-3) UNRELEASED; urgency=medium + [ Matthias Klose ] * Also explicitly link with -latomic on mips64el. * Disable openmp on loong64 (ld: cannot find -lomptarget.rtl.host). * Build without z3 on sh4 (ftbfs). * Also configure with -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="M68k;Xtensa". * debian/tests/*: s/18/19/. - -- Matthias Klose Sat, 31 Aug 2024 20:22:25 +0200 + [ Sylvestre Ledru ] + * Remove the cmake dependency on libLibcTableGenUtil.a + see https://github.com/llvm/llvm-project/issues/99819 + + -- Sylvestre Ledru Tue, 03 Sep 2024 14:56:07 +0200 llvm-toolchain-19 (1:19.1.0~++rc3-2) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index d16fca4b..0e508846 100755 --- a/debian/rules +++ b/debian/rules @@ -1329,7 +1329,7 @@ endif 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. - sed -i '/_IMPORT_CHECK_TARGETS \(Polly\|sancov\|llvm-omp-device-info\|omptarget\|omp\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake + sed -i '/_IMPORT_CHECK_TARGETS \(Polly\|sancov\|llvm-omp-device-info\|LibcTableGenUtil\|omptarget\|omp\)/ {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-\|MLIR\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake @@ -1337,7 +1337,7 @@ endif sed -i '/_cmake_import_check_files_for_.*\/bin\/.*/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake sed -i '/_IMPORT_CHECK_FILES_FOR_.*\/bin\/.*/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake sed -i '/_IMPORT_CHECK_FILES_FOR_\(mlir-\|Polly\|MLIR\|LibcTableGenUtil\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake - sed -i '/_cmake_import_check_files_for_\(mlir\|Polly\|MLIR\|omp\|omptarget\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake + sed -i '/_cmake_import_check_files_for_\(mlir\|Polly\|MLIR\|omp\|LibcTableGenUtil\|omptarget\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake # 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