From 0e6da0b3566cf0e363dcbf7a2146f3517998a9f6 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Fri, 28 Oct 2022 10:19:42 -0700 Subject: [PATCH 1/2] d/changelog: Start 1:13.0.1-9 changelog Signed-off-by: Jordan Justen --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 76514b61..db610918 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-13 (1:13.0.1-9) UNRELEASED; urgency=medium + + * UNRELEASED + + -- Jordan Justen Fri, 28 Oct 2022 10:17:57 -0700 + llvm-toolchain-13 (1:13.0.1-8) unstable; urgency=medium [ Sylvestre Ledru ] From 37a8a75e8630b00daf4667b492976d89fc226ad6 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Fri, 28 Oct 2022 10:21:39 -0700 Subject: [PATCH 2/2] d/rules: Don't send an empty string to cmake when llvm-spirv is not found Signed-off-by: Jordan Justen --- debian/changelog | 2 +- debian/rules | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index db610918..cfac21b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ llvm-toolchain-13 (1:13.0.1-9) UNRELEASED; urgency=medium - * UNRELEASED + * d/rules: Don't send an empty string to cmake when llvm-spirv is not found -- Jordan Justen Fri, 28 Oct 2022 10:17:57 -0700 diff --git a/debian/rules b/debian/rules index 891ce6b9..698482c0 100755 --- a/debian/rules +++ b/debian/rules @@ -234,10 +234,10 @@ else endif LIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;amdgcn-mesa-mesa3d;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl" -LIBCLC_TARGETS_LLVM_SPIRV := "" +LIBCLC_TARGETS_LLVM_SPIRV = ifeq ($(LLVM_SPIRV_INSTALLED),yes) LIBCLC_TARGETS_TO_BUILD := $(LIBCLC_TARGETS_TO_BUILD)";spirv-mesa3d-;spirv64-mesa3d-" - LIBCLC_TARGETS_LLVM_SPIRV := "-DLLVM_SPIRV=$(LLVM_SPIRV)" + LIBCLC_TARGETS_LLVM_SPIRV = "-DLLVM_SPIRV=$(LLVM_SPIRV)" endif BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386