diff options
Diffstat (limited to 'source/l/spirv-llvm-translator')
4 files changed, 3 insertions, 94 deletions
diff --git a/source/l/spirv-llvm-translator/1889.patch b/source/l/spirv-llvm-translator/1889.patch deleted file mode 100644 index cd6f21e52..000000000 --- a/source/l/spirv-llvm-translator/1889.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 98fadafeae0204defedd89f015f7fb88f2888b2f Mon Sep 17 00:00:00 2001 -From: Tulio Magno Quites Machado Filho <tuliom@redhat.com> -Date: Fri, 17 Mar 2023 14:27:10 -0300 -Subject: [PATCH] Fix standalone builds with LLVM_LINK_LLVM_DYLIB=ON - -Move the LLVM components to LINK_COMPONENTS because the DEPENDS list has -the same semantics as add_dependencies(). In this -case it doesn't include the LLVM components when calling the linker. ---- - lib/SPIRV/CMakeLists.txt | 47 ++++++++++++---------------------------- - 1 file changed, 14 insertions(+), 33 deletions(-) - -diff --git a/lib/SPIRV/CMakeLists.txt b/lib/SPIRV/CMakeLists.txt -index bbef00528..2810c6b2c 100644 ---- a/lib/SPIRV/CMakeLists.txt -+++ b/lib/SPIRV/CMakeLists.txt -@@ -38,42 +38,23 @@ set(SRC_LIST - libSPIRV/SPIRVType.cpp - libSPIRV/SPIRVValue.cpp - ) --if(LLVM_LINK_LLVM_DYLIB) -- add_llvm_library(LLVMSPIRVLib STATIC DISABLE_LLVM_LINK_LLVM_DYLIB -- ${SRC_LIST} -- DEPENDS -- intrinsics_gen -- LLVMAnalysis -- LLVMBitWriter -- LLVMCodeGen -- LLVMCore -- LLVMDemangle -- LLVMIRReader -- LLVMLinker -- LLVMPasses -- LLVMSupport -- LLVMTargetParser -- LLVMTransformUtils -- ) --else() -- add_llvm_library(LLVMSPIRVLib -- ${SRC_LIST} -- LINK_COMPONENTS -- Analysis -- BitWriter -- CodeGen -- Core -- Demangle -- IRReader -- Linker -- Passes -- Support -- TargetParser -- TransformUtils -+add_llvm_library(LLVMSPIRVLib STATIC DISABLE_LLVM_LINK_LLVM_DYLIB -+ ${SRC_LIST} -+ LINK_COMPONENTS -+ Analysis -+ BitWriter -+ CodeGen -+ Core -+ Demangle -+ IRReader -+ Linker -+ Passes -+ Support -+ TargetParser -+ TransformUtils - DEPENDS - intrinsics_gen - ) --endif() - - target_include_directories(LLVMSPIRVLib - PRIVATE diff --git a/source/l/spirv-llvm-translator/spirv-llvm-translator-noSTATIC-noDISABLE_LLVM_LINK_LLVM_DYLIB.diff b/source/l/spirv-llvm-translator/spirv-llvm-translator-noSTATIC-noDISABLE_LLVM_LINK_LLVM_DYLIB.diff deleted file mode 100644 index 73f65f558..000000000 --- a/source/l/spirv-llvm-translator/spirv-llvm-translator-noSTATIC-noDISABLE_LLVM_LINK_LLVM_DYLIB.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./lib/SPIRV/CMakeLists.txt.orig 2023-03-08 06:13:33.000000000 -0600 -+++ ./lib/SPIRV/CMakeLists.txt 2023-04-06 14:04:29.100168448 -0500 -@@ -39,7 +39,7 @@ - libSPIRV/SPIRVValue.cpp - ) - if(LLVM_LINK_LLVM_DYLIB) -- add_llvm_library(LLVMSPIRVLib STATIC DISABLE_LLVM_LINK_LLVM_DYLIB -+ add_llvm_library(LLVMSPIRVLib - ${SRC_LIST} - DEPENDS - intrinsics_gen diff --git a/source/l/spirv-llvm-translator/spirv-llvm-translator.SlackBuild b/source/l/spirv-llvm-translator/spirv-llvm-translator.SlackBuild index 621220ea8..a4c6b3249 100755 --- a/source/l/spirv-llvm-translator/spirv-llvm-translator.SlackBuild +++ b/source/l/spirv-llvm-translator/spirv-llvm-translator.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2021 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2021, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=spirv-llvm-translator VERSION=${VERSION:-$(echo SPIRV-LLVM-Translator-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -88,14 +88,6 @@ find . \ # the -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR option below. tar xf $CWD/SPIRV-Headers.tar.lz -## DISABLED... this still leads to problems which can be demonstrated by -## running clinfo. -## Fix -DBUILD_SHARED_LIBS=ON -#zcat $CWD/1889.patch.gz | patch -p1 --verbose || exit 1 - -# Avoid duplicated symbols. Thanks to lucabon! :-) -zcat $CWD/spirv-llvm-translator-noSTATIC-noDISABLE_LLVM_LINK_LLVM_DYLIB.diff.gz | patch -p1 --verbose || exit 1 - # Build and install: mkdir -p build cd build diff --git a/source/l/spirv-llvm-translator/spirv-llvm-translator.url b/source/l/spirv-llvm-translator/spirv-llvm-translator.url new file mode 100644 index 000000000..496ddeea3 --- /dev/null +++ b/source/l/spirv-llvm-translator/spirv-llvm-translator.url @@ -0,0 +1 @@ +https://github.com/KhronosGroup/SPIRV-LLVM-Translator |