diff options
| author |   Sam James <sam@gentoo.org> | 2022-10-01 04:11:54 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-10-01 04:12:04 +0100 |
| commit | d247aa7519850a5a67619659b91249892d4b5c41 (patch) | |
| tree | a44966daa96ddbda985cb57d88834e81d611b286 /dev-lang | |
| parent | app-admin/bitwarden-desktop-bin: drop 1.32.1 (diff) | |
| download | gentoo-d247aa7519850a5a67619659b91249892d4b5c41.tar.gz gentoo-d247aa7519850a5a67619659b91249892d4b5c41.tar.bz2 gentoo-d247aa7519850a5a67619659b91249892d4b5c41.zip | |
dev-lang/ispc: fix non-9999 patch
Closes: https://bugs.gentoo.org/873676
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/ispc/files/ispc-1.18.0-llvm.patch | 39 | ||||
| -rw-r--r-- | dev-lang/ispc/ispc-1.18.0.ebuild | 4 | ||||
| -rw-r--r-- | dev-lang/ispc/ispc-9999.ebuild | 4 |
3 files changed, 43 insertions, 4 deletions
diff --git a/dev-lang/ispc/files/ispc-1.18.0-llvm.patch b/dev-lang/ispc/files/ispc-1.18.0-llvm.patch new file mode 100644 index 000000000000..7303ac0fd6e8 --- /dev/null +++ b/dev-lang/ispc/files/ispc-1.18.0-llvm.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 13e66268..27ff8364 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -218,7 +218,7 @@ if (WASM_ENABLED) + list(APPEND ISPC_TARGETS wasm-i32x4) + endif() + +-set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex) ++set(CLANG_LIBRARY_LIST clang clang-cpp) + set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option frontendopenmp) + + if (X86_ENABLED) +@@ -402,11 +402,8 @@ if (ISPC_USE_ASAN) + endif() + + # Link against Clang libraries +-foreach(clangLib ${CLANG_LIBRARY_LIST}) +- find_library(${clangLib}Path NAMES ${clangLib} HINTS ${LLVM_LIBRARY_DIRS}) +- list(APPEND CLANG_LIBRARY_FULL_PATH_LIST ${${clangLib}Path}) +-endforeach() +-target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_FULL_PATH_LIST}) ++find_package(Clang REQUIRED) ++target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_LIST}) + + # Link against LLVM libraries + target_link_libraries(${PROJECT_NAME} ${LLVM_LIBRARY_LIST}) +diff --git a/src/llvmutil.cpp b/src/llvmutil.cpp +index 06fab989..57a7130f 100644 +--- a/src/llvmutil.cpp ++++ b/src/llvmutil.cpp +@@ -42,6 +42,7 @@ + #include <llvm/IR/BasicBlock.h> + #include <llvm/IR/Instructions.h> + #include <llvm/IR/Module.h> ++#include <llvm/Support/raw_ostream.h> + + #ifdef ISPC_GENX_ENABLED + #include <llvm/GenXIntrinsics/GenXIntrinsics.h> diff --git a/dev-lang/ispc/ispc-1.18.0.ebuild b/dev-lang/ispc/ispc-1.18.0.ebuild index 47d74e37d160..ec835cb94bdb 100644 --- a/dev-lang/ispc/ispc-1.18.0.ebuild +++ b/dev-lang/ispc/ispc-1.18.0.ebuild @@ -32,8 +32,8 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-9999-llvm.patch" - "${FILESDIR}"/ispc-1.18.0-curses-cmake.patch + "${FILESDIR}"/${PN}-1.18.0-llvm.patch + "${FILESDIR}"/${PN}-1.18.0-curses-cmake.patch ) pkg_setup() { diff --git a/dev-lang/ispc/ispc-9999.ebuild b/dev-lang/ispc/ispc-9999.ebuild index 8da425ce2b9c..843faa818262 100644 --- a/dev-lang/ispc/ispc-9999.ebuild +++ b/dev-lang/ispc/ispc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -31,7 +31,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-9999-llvm.patch" + "${FILESDIR}"/${PN}-9999-llvm.patch ) CMAKE_BUILD_TYPE="RelWithDebInfo" |