From 5befbff174406e5bae99c8d91245c628fed0585a Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Sun, 30 Oct 2022 15:16:19 -0700 Subject: [PATCH 1/2] d/rules: Check for previous version of llvm-spirv as well Signed-off-by: Jordan Justen --- debian/changelog | 1 + debian/rules | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index ae0f0704..73d6f099 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ llvm-toolchain-15 (1:15.0.3-3) UNRELEASED; urgency=medium * d/rules: Set LLVM_SPIRV with cmake for libclc * d/patches: Drop libclc-llvm-spirv.diff now that we are setting LLVM_SPIRV * d/rules: Restore building libclc .bc output without spir-v support + * d/rules: Check for previous version of llvm-spirv as well -- Jordan Justen Sun, 30 Oct 2022 00:26:40 -0700 diff --git a/debian/rules b/debian/rules index f1179237..4d8a59c8 100755 --- a/debian/rules +++ b/debian/rules @@ -245,6 +245,10 @@ endif LLVM_SPIRV_VERSION := $(LLVM_VERSION) LLVM_SPIRV := $(shell bash -c "command -v llvm-spirv-$(LLVM_SPIRV_VERSION)" 2>/dev/null) +ifndef LLVM_SPIRV + LLVM_SPIRV_VERSION := $(shell expr $(LLVM_VERSION) - 1) + LLVM_SPIRV := $(shell bash -c "command -v llvm-spirv-$(LLVM_SPIRV_VERSION)" 2>/dev/null) +endif ifndef LLVM_SPIRV LLVM_SPIRV_INSTALLED = no From b7f42769ed5bcfc452793e128df6b0f0aa989b89 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Sun, 30 Oct 2022 15:17:32 -0700 Subject: [PATCH 2/2] d/control: Add llvm-spirv-14 as an alternative to llvm-spirv-15 Signed-off-by: Jordan Justen --- debian/changelog | 1 + debian/control | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 73d6f099..8cb902ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ llvm-toolchain-15 (1:15.0.3-3) UNRELEASED; urgency=medium * d/patches: Drop libclc-llvm-spirv.diff now that we are setting LLVM_SPIRV * d/rules: Restore building libclc .bc output without spir-v support * d/rules: Check for previous version of llvm-spirv as well + * d/control: Add llvm-spirv-14 as an alternative to llvm-spirv-15 -- Jordan Justen Sun, 30 Oct 2022 00:26:40 -0700 diff --git a/debian/control b/debian/control index 7df354bb..db82f765 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,8 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x], libpfm4-dev [linux-any], python3-setuptools, libz3-dev, - llvm-spirv-15 [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] | hello [!i386], + llvm-spirv-15 [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] | + llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] | hello [!i386], spirv-tools [ linux-any ] | hello [ !i386], libcurl4-dev, libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],