From 9624fee558c2c7a7d94775ae0e78ed074493a430 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 24 Jul 2023 08:29:24 +0200 Subject: [PATCH] Do the delete of wasi in libclang-rt regardless (Closes: #1041834) --- debian/changelog | 6 ++++++ debian/rules | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 96da9663..f767ee89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -63,6 +63,12 @@ llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental -- Sylvestre Ledru Sat, 28 Jan 2023 18:07:40 +0100 +llvm-toolchain-16 (1:16.0.6-6) unstable; urgency=medium + + * Do the delete of wasi in libclang-rt regardless (Closes: #1041834) + + -- Sylvestre Ledru Mon, 24 Jul 2023 08:29:14 +0200 + llvm-toolchain-16 (1:16.0.6-5) unstable; urgency=medium [ Samuel Thibault ] diff --git a/debian/rules b/debian/rules index 3fe945ae..12876980 100755 --- a/debian/rules +++ b/debian/rules @@ -1293,13 +1293,11 @@ ifneq (,$(filter libc++-$(LLVM_VERSION)-dev-wasm32, $(shell dh_listpackages))) mv $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1/cxxabi.h \ $(CURDIR)/debian/libc++abi-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1/cxxabi.h; \ fi +endif # Because of hurd, we are more flexible in what we include in libclang-X.Y-rt # but we don't want to install wasi files into libclang-rt as they have their own package # So, we remove this directory from the package rm -fr $(CURDIR)/debian/libclang-rt-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)/lib/wasi/ -endif - - repack_a_llvm_ir: ifeq (${LTO_ENABLE},yes)