From 5bfe8cc3c2160a67e3fbf2a55394af87a0d6fb97 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 5 Oct 2022 20:40:59 +0200 Subject: [PATCH] fix bolt --- debian/changelog | 6 ++++++ debian/libbolt-X.Y-dev.install.in | 2 -- debian/rules | 8 ++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index aff9962c..d642fe46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-15 (1:15.0.2-2~exp1) experimental; urgency=medium + + * Ship bolt + + -- Sylvestre Ledru Tue, 04 Oct 2022 15:21:19 +0200 + llvm-toolchain-15 (1:15.0.2-1) unstable; urgency=medium * New upstream release diff --git a/debian/libbolt-X.Y-dev.install.in b/debian/libbolt-X.Y-dev.install.in index df12dc09..f98d299f 100644 --- a/debian/libbolt-X.Y-dev.install.in +++ b/debian/libbolt-X.Y-dev.install.in @@ -1,4 +1,2 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libbolt_rt_hugify.a usr/lib/llvm-@LLVM_VERSION@/lib/libbolt_rt_instr.a -usr/lib/llvm-@LLVM_VERSION@/lib/libbolt_rt_instr_osx.a - diff --git a/debian/rules b/debian/rules index 946baaae..0e2f335e 100755 --- a/debian/rules +++ b/debian/rules @@ -270,7 +270,7 @@ endif BOLT_ARCHS := amd64 arm64 ifneq (,$(filter $(DEB_HOST_ARCH),$(BOLT_ARCHS))) -# PROJECTS += ;bolt + PROJECTS += ;bolt endif CODECOVERAGE=no @@ -650,7 +650,6 @@ override_dh_auto_configure: preconfigure exit 1; \ fi -# ninja VERBOSE=-v debian-full-build: @@ -851,6 +850,11 @@ endif rm -rf $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/build/utils/lit/lit/__pycache__/ \ $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/build/utils/lit/lit/*/__pycache__/ + # workaround issue https://github.com/llvm/llvm-project/issues/57101 + find debian/tmp -iname 'libbolt_rt*.a' -path '*/build-llvm/*' -delete + # Remove an osx file + rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libbolt_rt_instr_osx.a + ifeq ($(LLVM_SPIRV_INSTALLED),yes) DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C libclc/build install endif