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

Merge branch 'libclc-15-spv-15-or-14' into '15'

Browse Source 
Use llvm-spirv-15, but add a fall-back to use llvm-spirv-14

See merge request pkg-llvm-team/llvm-toolchain!101
This commit is contained in:
Sylvestre Ledru 2022-10-31 07:04:04 +00:00
commit 5c0ae55f0f
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -7,6 +7,8 @@ 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
* d/control: Add llvm-spirv-14 as an alternative to llvm-spirv-15
-- Jordan Justen <jljusten@debian.org> Sun, 30 Oct 2022 00:26:40 -0700

3
debian/control vendored
View File

@ -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 ] <!stage1> | hello [!i386],
llvm-spirv-15 [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] <!stage1> |
llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] <!stage1> | hello [!i386],
spirv-tools [ linux-any ] | hello [ !i386],
libcurl4-dev,
libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],

4
debian/rules vendored
View File

@ -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