From 5a2d6510ee643e5665e0ff09df499479cb436342 Mon Sep 17 00:00:00 2001 From: Idris Kalp Date: Sat, 5 Jun 2021 20:59:02 +0300 Subject: [PATCH] spirv-llvm fix --- x11/vulkan/spirv-llvm/actions.py | 8 +++++++- x11/vulkan/spirv-llvm/pspec.xml | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/x11/vulkan/spirv-llvm/actions.py b/x11/vulkan/spirv-llvm/actions.py index 59f6c700fe..e73aea2cc6 100644 --- a/x11/vulkan/spirv-llvm/actions.py +++ b/x11/vulkan/spirv-llvm/actions.py @@ -6,14 +6,20 @@ from pisi.actionsapi import cmaketools from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools from pisi.actionsapi import get +tools = "-DLLVM_BUILD_TOOLS=OFF" if get.buildTYPE() == "emul32" else "-DLLVM_BUILD_TOOLS=ON" + def setup(): cmaketools.configure("-DBUILD_SHARED_LIBS=ON \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DCMAKE_SKIP_RPATH=ON \ - -DLLVM_INCLUDE_TESTS=ON") + -DLLVM_SPIRV_BUILD_EXTERNAL=YES \ + -DLLVM_INCLUDE_TESTS=ON \ + %s \ + -Wno-dev" %tools) def build(): cmaketools.make() diff --git a/x11/vulkan/spirv-llvm/pspec.xml b/x11/vulkan/spirv-llvm/pspec.xml index 4d4f14ed9d..d50f214800 100644 --- a/x11/vulkan/spirv-llvm/pspec.xml +++ b/x11/vulkan/spirv-llvm/pspec.xml @@ -18,6 +18,7 @@ python3-devel llvm-mlir llvm-libs + spirv-tools-devel libxml2-devel llvm-clang-devel python3-setuptools @@ -35,6 +36,7 @@ llvm libgcc + spirv-tools /usr/lib @@ -50,9 +52,11 @@ llvm-32bit libxml2-32bit + spirv-tools-32bit - llvm-32bit + llvm-32bit + spirv-tools-32bit /usr/lib32 @@ -66,6 +70,7 @@ spirv-llvm + /usr/bin /usr/include /usr/lib/pkgconfig /usr/lib32/pkgconfig