Merge remote-tracking branch 'origin/13' into 14

This commit is contained in:
Sylvestre Ledru 2022-10-29 22:17:48 +02:00
commit eca12ecd2d
2 changed files with 23 additions and 2 deletions

21
debian/changelog vendored
View File

@ -482,6 +482,27 @@ llvm-toolchain-snapshot (1:14~++20210715093511+afc760ef3527-1~exp2) unstable; ur
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 06 Aug 2021 08:40:58 +0200 -- Sylvestre Ledru <sylvestre@debian.org> Fri, 06 Aug 2021 08:40:58 +0200
llvm-toolchain-13 (1:13.0.1-9) UNRELEASED; urgency=medium
* d/rules: Don't send an empty string to cmake when llvm-spirv is not found
-- Jordan Justen <jljusten@debian.org> Fri, 28 Oct 2022 10:17:57 -0700
llvm-toolchain-13 (1:13.0.1-8) unstable; urgency=medium
[ Sylvestre Ledru ]
* Disable the build of libclc on old Ubuntu (Groovy & focal)
as llvm-spir is too old on these version.
See bug #52200
[ Jordan Justen ]
* 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
llvm-toolchain-13 (1:13.0.1-7) unstable; urgency=medium llvm-toolchain-13 (1:13.0.1-7) unstable; urgency=medium
[ Michael Biebl ] [ Michael Biebl ]

4
debian/rules vendored
View File

@ -243,10 +243,10 @@ else
endif endif
LIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;amdgcn-mesa-mesa3d;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl" LIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;amdgcn-mesa-mesa3d;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl"
LIBCLC_TARGETS_LLVM_SPIRV := "" LIBCLC_TARGETS_LLVM_SPIRV =
ifeq ($(LLVM_SPIRV_INSTALLED),yes) ifeq ($(LLVM_SPIRV_INSTALLED),yes)
LIBCLC_TARGETS_TO_BUILD := $(LIBCLC_TARGETS_TO_BUILD)";spirv-mesa3d-;spirv64-mesa3d-" LIBCLC_TARGETS_TO_BUILD := $(LIBCLC_TARGETS_TO_BUILD)";spirv-mesa3d-;spirv64-mesa3d-"
LIBCLC_TARGETS_LLVM_SPIRV := "-DLLVM_SPIRV=$(LLVM_SPIRV)" LIBCLC_TARGETS_LLVM_SPIRV = "-DLLVM_SPIRV=$(LLVM_SPIRV)"
endif endif
BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386 BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386