CVS commit: pkgsrc/parallel/spirv-llvm-translator

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Oct  6 19:24:09 UTC 2023

Modified Files:
        pkgsrc/parallel/spirv-llvm-translator: Makefile distinfo
Added Files:
        pkgsrc/parallel/spirv-llvm-translator/patches:
            patch-lib_SPIRV_CMakeLists.txt

Log Message:
spirv-llvm-translator: updated to 16.0.0

16.0.0
Update LLVM version from 15 to 16


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/parallel/spirv-llvm-translator/Makefile \
    pkgsrc/parallel/spirv-llvm-translator/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/parallel/spirv-llvm-translator/Makefile
diff -u pkgsrc/parallel/spirv-llvm-translator/Makefile:1.7 pkgsrc/parallel/spirv-llvm-translator/Makefile:1.8
--- pkgsrc/parallel/spirv-llvm-translator/Makefile:1.7  Mon Nov 14 18:58:47 2022
+++ pkgsrc/parallel/spirv-llvm-translator/Makefile      Fri Oct  6 19:24:09 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2022/11/14 18:58:47 adam Exp $
+# $NetBSD: Makefile,v 1.8 2023/10/06 19:24:09 adam Exp $
 
-DISTNAME=      SPIRV-LLVM-Translator-15.0.0
+DISTNAME=      SPIRV-LLVM-Translator-16.0.0
 PKGNAME=       ${DISTNAME:tl}
 CATEGORIES=    parallel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=KhronosGroup/}
@@ -13,16 +13,16 @@ LICENSE=    modified-bsd
 
 WRKSRC=                ${WRKDIR}/${DISTNAME}
 
-USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 
 GCC_REQD+=     7 # sync with llvm
 
-CMAKE_ARGS+=   -DBUILD_SHARED_LIBS=ON
-CMAKE_ARGS+=   -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${PREFIX}/include/libLLVM
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${PREFIX}/include/libLLVM
 
 PKGCONFIG_OVERRIDE+=   LLVMSPIRVLib.pc.in
 
+.include "../../devel/cmake/build.mk"
 .include "../../lang/llvm/buildlink3.mk"
 .include "../../parallel/spirv-headers/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/parallel/spirv-llvm-translator/distinfo
diff -u pkgsrc/parallel/spirv-llvm-translator/distinfo:1.7 pkgsrc/parallel/spirv-llvm-translator/distinfo:1.8
--- pkgsrc/parallel/spirv-llvm-translator/distinfo:1.7  Mon Nov 14 18:58:47 2022
+++ pkgsrc/parallel/spirv-llvm-translator/distinfo      Fri Oct  6 19:24:09 2023
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2022/11/14 18:58:47 adam Exp $
+$NetBSD: distinfo,v 1.8 2023/10/06 19:24:09 adam Exp $
 
-BLAKE2s (SPIRV-LLVM-Translator-15.0.0.tar.gz) = 4be950e856869ba027caae32068a185ce559846945867221fbd086f874caca40
-SHA512 (SPIRV-LLVM-Translator-15.0.0.tar.gz) = 8a6ddddf326dad96c1c5749ebf03e63e6be60592dccd307f7a35be668cec2b4f58c2f089854aeefa37398c3a97dad6bf92a6ceb892da27b5cf9d4ae1aa41dd06
-Size (SPIRV-LLVM-Translator-15.0.0.tar.gz) = 1515145 bytes
+BLAKE2s (SPIRV-LLVM-Translator-16.0.0.tar.gz) = cc26326de1b3062cb9b6351e6daa313b24ffffa951700b3d6df83e119e0f5541
+SHA512 (SPIRV-LLVM-Translator-16.0.0.tar.gz) = 0bacacb89aa2b03d1173d1bfbcdd83fdce7441ebc3fff65e14dc5e901fc983861365a54c029b2a65075b6fa45046c30aa7bbad4e6150cf3382e7d050c598de98
+Size (SPIRV-LLVM-Translator-16.0.0.tar.gz) = 1542060 bytes
 SHA1 (patch-CMakeLists.txt) = db9173e06fb702c3fa88844fc87380262024cbe1
+SHA1 (patch-lib_SPIRV_CMakeLists.txt) = 86e2bea2e56321af7526502d0a5d65f2680d6a46

Added files:

Index: pkgsrc/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_CMakeLists.txt
diff -u /dev/null pkgsrc/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_CMakeLists.txt:1.1
--- /dev/null   Fri Oct  6 19:24:09 2023
+++ pkgsrc/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_CMakeLists.txt        Fri Oct  6 19:24:09 2023
@@ -0,0 +1,40 @@
+$NetBSD: patch-lib_SPIRV_CMakeLists.txt,v 1.1 2023/10/06 19:24:09 adam Exp $
+
+Fix standalone builds with LLVM_LINK_LLVM_DYLIB=ON
+https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1889
+
+--- lib/SPIRV/CMakeLists.txt.orig      2023-10-06 14:21:17.207960916 +0000
++++ lib/SPIRV/CMakeLists.txt
+@@ -38,24 +38,6 @@ 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
+@@ -73,7 +55,6 @@ else()
+   DEPENDS
+     intrinsics_gen
+   )
+-endif()
+ 
+ target_include_directories(LLVMSPIRVLib
+   PRIVATE