From f7dfd37779a69a1d5b08e20a3864a87c23f4df92 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Thu, 6 Jun 2024 20:17:58 +0000 Subject: [PATCH] import changes made outside git. --- debian/changelog | 5 +++-- debian/libclang-rt-X.Y-dev.install.in | 1 - debian/rules | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5f88438d78..41cb11b45c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,13 +43,14 @@ llvm-toolchain-16 (1:16.0.6-27+rpi1) trixie-staging; urgency=medium [changes brought forward from 1:13.0.0-9+rpi2 by Peter Michael Green at Tue, 23 Nov 2021 22:37:30 +0000] * Remove armhf from architecture list for libunwind-16-dev dependency. - [changes introduced in llvm-toolchain-16 1:16.0.6-20+rpi1 by Peter Micheal Green] + [changes introduced in llvm-toolchain-16 1:16.0.6-27+rpi1 by Peter Micheal Green] * Remove armhf from spirv architecture list, llvm-spirv-16 fails to build on raspbian. * Don't build sanitiser support in compiler_rt on armhf, it fails to link on raspbian. * Don't fail build if chrpath fails. + * Don't fail build on missing files. - -- Peter Michael Green Sat, 16 Mar 2024 12:15:03 +0000 + -- Peter Michael Green Tue, 04 Jun 2024 06:14:31 +0000 llvm-toolchain-16 (1:16.0.6-27) unstable; urgency=medium diff --git a/debian/libclang-rt-X.Y-dev.install.in b/debian/libclang-rt-X.Y-dev.install.in index ebe7c0bd26..23872c5d17 100644 --- a/debian/libclang-rt-X.Y-dev.install.in +++ b/debian/libclang-rt-X.Y-dev.install.in @@ -4,7 +4,6 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/share/*.txt usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/sanitizer/ [!sparc !sparc64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/*/*clang_rt* usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/README.txt -usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/fuzzer/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/orc/c_api.h # See compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake / ALL_ORC_SUPPORTED_ARCH [amd64 arm64 armhf armel i386] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/liborc_rt* diff --git a/debian/rules b/debian/rules index 4c91d7b693..2b23718a3b 100755 --- a/debian/rules +++ b/debian/rules @@ -1318,7 +1318,7 @@ else rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake endif endif - dh_install --fail-missing + dh_install # Move the libc++ abi files from libc++ to libc++-abi for the wasm32 packages # These packages are arch: all, so only do so when the packages are built ifneq (,$(filter libc++-$(LLVM_VERSION)-dev-wasm32, $(shell dh_listpackages))) -- 2.30.2