From 374beb47690786e0c073b00206bd4ed5308bb36e Mon Sep 17 00:00:00 2001 From: aliriza Date: Mon, 23 Jan 2023 10:21:43 +0000 Subject: [PATCH] fix spirv-llvm-translator --- dev/util/spirv-llvm-translator/ympbuild | 23 ++++++++++------------- sys/devel/llvm/ympbuild | 19 +++++++------------ 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/dev/util/spirv-llvm-translator/ympbuild b/dev/util/spirv-llvm-translator/ympbuild index 0e1190dc..b1aa4d9e 100644 --- a/dev/util/spirv-llvm-translator/ympbuild +++ b/dev/util/spirv-llvm-translator/ympbuild @@ -1,16 +1,16 @@ #!/usr/bin/env bash name='spirv-llvm-translator' release='1' -version='14.0.0' +version='15.0.0' url='https://github.com/KhronosGroup/SPIRV-LLVM-Translator' description='Bi-directional translator between SPIR-V and LLVM IR' email='aliriza.keskin@pardus.org.tr' maintainer='aliriza' license=('GPLv3') -source=("https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v$version.tar.gz") +source=("https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v$version/SPIRV-LLVM-Translator-$version.tar.gz") depends=(spirv-tools) makedepends=() -md5sums=('ae2b5b53e27bfbd700346db2d481c7d8') +md5sums=('19e3ee2fb84754602ec754c594b20a1d') group=() uses=() arch=('x86_64') @@ -19,23 +19,20 @@ cd SPIRV-LLVM-Translator-$version setup(){ mkdir build && cd build - cmake .. \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_BUILD_TYPE=Release \ + cmake .. -G Ninja \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DCMAKE_SKIP_RPATH=ON \ - -DLLVM_INCLUDE_TESTS=ON \ + -DBUILD_SHARED_LIBS=True \ + -DLLVM_SPIRV_INCLUDE_TESTS=1 \ -DLLVM_EXTERNAL_LIT=/usr/bin/lit \ - -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=/usr/include/spirv/ \ - -Wno-dev + -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=/usr/include/spirv + } build(){ - make -C build + ninja -C build } package(){ - make -C build install + ninja -C build install } diff --git a/sys/devel/llvm/ympbuild b/sys/devel/llvm/ympbuild index d133ab11..773b8e98 100644 --- a/sys/devel/llvm/ympbuild +++ b/sys/devel/llvm/ympbuild @@ -24,27 +24,22 @@ export PYTHON=/usr/bin/python3 cmake_args=( -G Ninja -DCMAKE_BUILD_TYPE=Release - -DLLVM_APPEND_VC_REV=OFF + -DCMAKE_INSTALL_DOCDIR=share/doc + -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_SKIP_RPATH=ON -DLLVM_BINUTILS_INCDIR=/usr/include -DLLVM_BUILD_DOCS=OFF - -DLLVM_BUILD_EXAMPLES=OFF - -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON - -DLLVM_BUILD_TESTS=OFF - -DLLVM_ENABLE_ASSERTIONS=OFF - -DLLVM_ENABLE_EH=ON + -DLLVM_BUILD_TESTS=ON + -DLLVM_ENABLE_BINDINGS=OFF -DLLVM_ENABLE_FFI=ON - -DLLVM_ENABLE_LIBCXX=OFF - -DLLVM_ENABLE_PIC=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_ENABLE_SPHINX=OFF - -DLLVM_ENABLE_TERMINFO=ON - -DLLVM_ENABLE_ZLIB=ON - -DLLVM_ENABLE_ZSTD=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF - -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INSTALL_UTILS=ON -DLLVM_LINK_LLVM_DYLIB=ON + -DLLVM_USE_PERF=ON + -DSPHINX_WARNINGS_AS_ERRORS=OFF ) prepare(){