From 0197a4349a9fac6a793cab7e2e2d13f7806c41b5 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 18 Sep 2021 19:30:53 +0200 Subject: [PATCH 1/3] Replace make by ninja for the build process It is now more tested than make by upstream And it is supposed to be faster Removed openmp/bootstrap-with-openmp-version-export-missing.diff as it seems that the ninja move fixed it --- debian/changelog | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7bb162d8..1b689d4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ -llvm-toolchain-13 (1:13.0.0~+rc3-2) UNRELEASED; urgency=medium +llvm-toolchain-13 (1:13.0.0~+rc3-2) unstable; urgency=medium * Ship clang-repl See https://reviews.llvm.org/D106813 + * Replace make by ninja for the build process + It is now more tested than make by upstream + And it is supposed to be faster + Removed openmp/bootstrap-with-openmp-version-export-missing.diff + as it seems that the ninja move fixed it - -- Sylvestre Ledru Fri, 17 Sep 2021 22:43:42 +0200 + -- Sylvestre Ledru Sat, 18 Sep 2021 19:30:47 +0200 llvm-toolchain-13 (1:13.0.0~+rc3-1) unstable; urgency=medium From 44b820ea055fcc5cfb4a6a9c0f86e8c98f473810 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 18 Sep 2021 21:03:15 +0200 Subject: [PATCH 2/3] remove the build dir --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 8c739d22..507c99e4 100755 --- a/debian/rules +++ b/debian/rules @@ -796,7 +796,7 @@ endif # Delete the target build directory to save some space on the build systems # All the files have been installed in $(CURDIR)/debian/tmp/ already -# rm -rf $(TARGET_BUILD) + rm -rf $(TARGET_BUILD) override_dh_makeshlibs: From 35b25e90096d74fa84e57aa1aa7a40cbe5108ae7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 18 Sep 2021 21:08:54 +0200 Subject: [PATCH 3/3] fix the syntax --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index cdd88168..4ae0b6ef 100755 --- a/debian/rules +++ b/debian/rules @@ -129,7 +129,7 @@ else control_vars = '-Vdep:devlibs=libstdc++6-$(GCC_VERSION)-dev' endif -ifeq ($(shell type -p llvm-spirv),) +ifeq $(shell bash -c "type -p llvm-spirv")) LLVM_SPIRV_INSTALLED = no else LLVM_SPIRV_INSTALLED = yes