proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-08-12 14:15:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enable spirv again to unbreak mesa build

Browse Source
This commit is contained in:
Gianfranco Costamagna 2023-08-03 14:21:50 +02:00
parent 8995e6778a
commit 8a0b005291
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
llvm-toolchain-16 (1:16.0.6-9) unstable; urgency=medium
* Really enable spirv, and disable spirv on mips* since it's not yet
bootstrapped. Thanks <tjaalton> for the patch
-- Gianfranco Costamagna <locutusofborg@debian.org> Thu, 03 Aug 2023 14:20:06 +0200
llvm-toolchain-16 (1:16.0.6-8) unstable; urgency=medium llvm-toolchain-16 (1:16.0.6-8) unstable; urgency=medium
* Make sure flang-16 depends on libflang-16-dev (Closes: #1041202) * Make sure flang-16 depends on libflang-16-dev (Closes: #1041202)

2
debian/control vendored
View File

@ -22,7 +22,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x], dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
libpfm4-dev [linux-any], python3-setuptools, libz3-dev, libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
llvm-spirv-16 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | llvm-spirv-16 [ amd64 arm64 armel armhf ppc64el riscv64 s390x ] <!stage1> |
llvm-spirv-15 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | llvm-spirv-15 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> |
llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello [!i386], llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
spirv-tools [ linux-any ] | hello [ !i386], spirv-tools [ linux-any ] | hello [ !i386],

2
debian/control.in vendored
View File

@ -22,7 +22,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x], dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
libpfm4-dev [linux-any], python3-setuptools, libz3-dev, libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
llvm-spirv-16 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | llvm-spirv-16 [ amd64 arm64 armel armhf ppc64el riscv64 s390x ] <!stage1> |
llvm-spirv-15 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | llvm-spirv-15 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> |
llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello [!i386], llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
spirv-tools [ linux-any ] | hello [ !i386], spirv-tools [ linux-any ] | hello [ !i386],

3
debian/rules vendored
View File

@ -249,9 +249,6 @@ ifndef LLVM_SPIRV
LLVM_SPIRV_VERSION := $(shell expr $(LLVM_VERSION) - 1) LLVM_SPIRV_VERSION := $(shell expr $(LLVM_VERSION) - 1)
LLVM_SPIRV := $(shell bash -c "command -v llvm-spirv-$(LLVM_SPIRV_VERSION)" 2>/dev/null) LLVM_SPIRV := $(shell bash -c "command -v llvm-spirv-$(LLVM_SPIRV_VERSION)" 2>/dev/null)
endif endif
# For now, disable spir because it needs
# 16 because of opaque pointers
undefine LLVM_SPIRV
ifndef LLVM_SPIRV ifndef LLVM_SPIRV
LLVM_SPIRV_INSTALLED = no LLVM_SPIRV_INSTALLED = no
else else