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

d/rules: Rename LLVM_SPIR_VERSION to LLVM_SPIRV_VERSION

Browse Source 
Signed-off-by: Jordan Justen <jljusten@debian.org>
This commit is contained in:
Jordan Justen 2022-10-29 02:05:30 -07:00
parent df549cc1e1
commit 45ef20d146
No known key found for this signature in database
GPG Key ID: 9A85A5A3468AE8E3
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -1,6 +1,7 @@
llvm-toolchain-15 (1:15.0.3-3) UNRELEASED; urgency=medium llvm-toolchain-15 (1:15.0.3-3) UNRELEASED; urgency=medium
* UNRELEASED [ Jordan Justen ]
* d/rules: Rename LLVM_SPIR_VERSION to LLVM_SPIRV_VERSION
-- Jordan Justen <jljusten@debian.org> Sun, 30 Oct 2022 00:26:40 -0700 -- Jordan Justen <jljusten@debian.org> Sun, 30 Oct 2022 00:26:40 -0700

8
debian/rules vendored
View File

@ -243,11 +243,11 @@ else
control_vars = '-Vdep:devlibs=libstdc++6-$(GCC_VERSION)-dev' control_vars = '-Vdep:devlibs=libstdc++6-$(GCC_VERSION)-dev'
endif endif
LLVM_SPIR_VERSION=14 LLVM_SPIRV_VERSION=14
ifeq ($(shell command -v llvm-spirv-$(LLVM_SPIR_VERSION)),) ifeq ($(shell command -v llvm-spirv-$(LLVM_SPIRV_VERSION)),)
LLVM_SPIRV_INSTALLED = no LLVM_SPIRV_INSTALLED = no
else else
ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' llvm-spirv-$(LLVM_SPIR_VERSION)) gt 14.0.0 ; echo $$?),0) ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' llvm-spirv-$(LLVM_SPIRV_VERSION)) gt 14.0.0 ; echo $$?),0)
# Too old llvm-spirv version are failing. See #52200 # Too old llvm-spirv version are failing. See #52200
LLVM_SPIRV_INSTALLED = yes LLVM_SPIRV_INSTALLED = yes
else else
@ -733,7 +733,7 @@ ifeq ($(LLVM_SPIRV_INSTALLED),yes)
-DCMAKE_INSTALL_DATADIR=lib \ -DCMAKE_INSTALL_DATADIR=lib \
-DCMAKE_INSTALL_INCLUDEDIR=include \ -DCMAKE_INSTALL_INCLUDEDIR=include \
-DLLVM_CONFIG=$(STAGE_2_BIN_DIR)/llvm-config \ -DLLVM_CONFIG=$(STAGE_2_BIN_DIR)/llvm-config \
-DLLVM_SPIRV=/usr/bin/llvm-spirv-$(LLVM_SPIR_VERSION) \ -DLLVM_SPIRV=/usr/bin/llvm-spirv-$(LLVM_SPIRV_VERSION) \
-DLIBCLC_TARGETS_TO_BUILD=$(LIBCLC_TARGETS_TO_BUILD); \ -DLIBCLC_TARGETS_TO_BUILD=$(LIBCLC_TARGETS_TO_BUILD); \
ninja -j $(NJOBS) $(VERBOSE) ninja -j $(NJOBS) $(VERBOSE)
else else