From 3b5da5d9fdd340da09e2e1c08f24b8912390559a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 19 Dec 2022 11:10:19 +0100 Subject: [PATCH] * Transform debian/control into debian/control.in (preparation for flang support) * Try to unbreak the builds with wasm --- debian/changelog | 10 +++++++--- debian/rules | 16 ++++++++++------ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5b72a647..a0c69853 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -llvm-toolchain-14 (1:14.0.6-10~exp2) UNRELEASED; urgency=medium +llvm-toolchain-14 (1:14.0.6-10~exp3) UNRELEASED; urgency=medium - * transform debian/control into debian/control.in + * Transform debian/control into debian/control.in (preparation for + flang support) - -- Sylvestre Ledru Sat, 10 Dec 2022 16:34:17 +0100 + [ Faidon Liambotis ] + * Try to unbreak the builds with wasm + + -- Sylvestre Ledru Mon, 19 Dec 2022 11:09:58 +0100 llvm-toolchain-14 (1:14.0.6-10~exp1) experimental; urgency=medium diff --git a/debian/rules b/debian/rules index 93e9f558..821e7f4d 100755 --- a/debian/rules +++ b/debian/rules @@ -1162,6 +1162,16 @@ else endif endif dh_install --fail-missing +# 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))) + mkdir -p $(CURDIR)/debian/libc++abi-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1 + mv $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1/__cxxabi_config.h \ + $(CURDIR)/debian/libc++abi-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1/__cxxabi_config.h + 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 +endif + override_dh_installdeb: # Managed by the package @@ -1178,12 +1188,6 @@ override_dh_installdeb: # Remove some libc++ abi files in the libc++ file. See bug #969274 rm -f $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/include/c++/__cxxabi_config.h $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/include/c++/cxxabi.h - mkdir -p $(CURDIR)/debian/libc++abi-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1 - mv $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1/__cxxabi_config.h \ - $(CURDIR)/debian/libc++abi-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1/__cxxabi_config.h - 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 - # Remove auto generated python pyc find $(CURDIR)/debian/llvm-$(LLVM_VERSION)-tools/usr/lib/llvm-$(LLVM_VERSION)/ -name '*.pyc' | xargs -r rm -f