commit 97e6ec64c5926acae149f0fb54e0627073ac3a84 Author: Tim Biermann <tbier@posteo.de> Date: Mon Nov 27 20:52:38 2023 +0100 spirv-llvm-translator: use external lit, never use clang/lld diff --git a/spirv-llvm-translator/.signature b/spirv-llvm-translator/.signature index b40969b3d..35f685c53 100644 --- a/spirv-llvm-translator/.signature +++ b/spirv-llvm-translator/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/QG4axlzSbfueA/07NZCYk+0zfEjb+b3QcCUNqNBokuX+qBOwonbMY37iw6KY8DpJ3bVVd/eg+O1+AW0I1ZI0As= -SHA256 (Pkgfile) = b4852b38da77cef86be40db174aed706369687fec2ba2650ac0f75155c51e942 +RWSE3ohX2g5d/bn3yAQWVB02xIwicmdnTVb6PfKnWrko23gEBAUozg3QBPXktVko+T8MlHj0kcbMifoCHhu/4DId/ONMAyTUlQU= +SHA256 (Pkgfile) = bbfdbb82a1a74a313ec376684c8542622e86096307a2be5bda2c2d3e2122b593 SHA256 (.footprint) = cd463b26973c4d27d3224f5f0cc026b48489191c2610d91098c10c033d914000 SHA256 (spirv-llvm-translator-17.0.0.tar.gz) = eba381e1dd99b4ff6c672a28f52755d1adf2d810a97b51e6074ad4fa67937fb2 diff --git a/spirv-llvm-translator/Pkgfile b/spirv-llvm-translator/Pkgfile index ec15cc488..bf45a1680 100644 --- a/spirv-llvm-translator/Pkgfile +++ b/spirv-llvm-translator/Pkgfile @@ -2,7 +2,6 @@ # URL: https://github.com/KhronosGroup/SPIRV-LLVM-Translator # Maintainer: Tim Biermann, tbier at posteo dot de # Depends on: llvm spirv-tools -# Optional: clang lld name=spirv-llvm-translator version=17.0.0 @@ -12,11 +11,6 @@ source=(https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v$version/ build() { prt-get isinst ccache && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')" - if prt-get isinst clang lld; then - export CC=clang CXX=clang++ AR=llvm-ar NM=llvm-nm RANLIB=llvm-ranlib LDFLAGS+=' -fuse-ld=lld' - PKGMK_SLT+=' -D LLVM_ENABLE_LTO=ON' - fi - cmake -S SPIRV-LLVM-Translator-$version -B build -G Ninja $PKGMK_SLT \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_INSTALL_LIBDIR=lib \ @@ -27,6 +21,7 @@ build() { -D CMAKE_SKIP_RPATH=ON \ -D LLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=/usr/include/spirv \ -D FETCHCONTENT_FULLY_DISCONNECTED=ON \ + -D LLVM_EXTERNAL_LIT=/usr/bin/lit \ -Wno-dev cmake --build build