proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-06-24 20:20:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

d/rules: Check for llvm-spirv with version suffix

Browse Source 
Since llvm-spirv-13, the '-13' suffix has been added to the
executable.

Signed-off-by: Jordan Justen <jljusten@debian.org>
This commit is contained in:
Jordan Justen 2022-10-26 10:23:14 -07:00
parent d214584519
commit d03015ee7c
No known key found for this signature in database
GPG Key ID: 9A85A5A3468AE8E3
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -7,6 +7,7 @@ llvm-toolchain-14 (1:14.0.6-7) UNRELEASED; urgency=medium
* d/rules: Call bash to use 'command -v' to location llvm-spirv executable
* 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: Check for llvm-spirv with version suffix
-- Jordan Justen <jljusten@debian.org> Wed, 26 Oct 2022 10:13:59 -0700

16
debian/rules vendored
View File

@ -223,16 +223,22 @@ else
control_vars = '-Vdep:devlibs=libstdc++6-$(GCC_VERSION)-dev'
endif
LLVM_SPIRV := $(shell bash -c "command -v llvm-spirv" 2>/dev/null)
LLVM_SPIRV := $(shell bash -c "command -v llvm-spirv llvm-spirv-$(LLVM_VERSION)" 2>/dev/null)
ifndef LLVM_SPIRV
LLVM_SPIRV_INSTALLED = no
else
ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' llvm-spirv) gt 10.0.0 ; echo $$?),0)
# Too old llvm-spirv version are failing. See #52200
LLVM_SPIRV_INSTALLED = yes
# if executable is llvm-spirv without a -$(LLVM_VERSION) suffix
ifeq ($(LLVM_SPIRV:-$(LLVM_VERSION)=),$(LLVM_SPIRV))
# Too old llvm-spirv version are failing. See #52200
ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' llvm-spirv) gt 10.0.0 ; echo $$?),0)
LLVM_SPIRV_INSTALLED = yes
else
LLVM_SPIRV_INSTALLED = no
endif
else
LLVM_SPIRV_INSTALLED = no
# llvm-spirv renamed llvm-spirv-$(LLVM_VERSION) as of llvm-spirv-13
LLVM_SPIRV_INSTALLED = yes
endif
endif