diff options
Diffstat (limited to 'dev-lang/ispc')
| -rw-r--r-- | dev-lang/ispc/Manifest | 5 | ||||
| -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 |
4 files changed, 46 insertions, 6 deletions
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest index 039afadc3b2e..51640600d795 100644 --- a/dev-lang/ispc/Manifest +++ b/dev-lang/ispc/Manifest @@ -1,8 +1,9 @@ AUX ispc-1.18.0-curses-cmake.patch 597 BLAKE2B 083a949e99a00819b1eed3ecb4276c7018f914a4902ea4c41dbd2a10c934d908ef2bc29a45e869ce290d5e787a7642de1ed630bc697b02e07267bb4e848fa1fc SHA512 6ba529e8dd4ce1483149e51a9a8ed28b476f604fcec263f806be7f9ec1b55decf8603126ea70600dce3d6947a328d907d046d25cc401847f6701cc9741d6cd14 +AUX ispc-1.18.0-llvm.patch 1410 BLAKE2B 77027da9032fa230c72d8608c2a6cd63c33601e17acab0260101c64dbb50a0aa3cc30702c4480ae5d63e95ec3e962e28bdbbd90cd72f4e91d30dc364b82367b6 SHA512 116078d5ab99c849584cc4ece8dc3ebc817221a2377e26083071e206b5e83c4f3ed594f84b86c9659ef86a497bd3cd058ee32138238e12e6aa9dac0f11cf1440 AUX ispc-9999-llvm.patch 1688 BLAKE2B 1eb6cfa4a8c42bed5e5472a0e81962edb4d823af34f67025a782833a5211c3e9925a68d0fd7137ad58ff21f113fe9cfedac47c29d04dad7c1c934d4fc7f238f3 SHA512 8f986ef14bb138a8777c6d82bbb0519a6722eb34fcda86107b268d5e63c7283cdc1242162fad57080a4cb32e0ddd0fa0010400211cd731df63aeeb6f198e26b7 DIST ispc-1.17.0.tar.gz 19436681 BLAKE2B 11af6e22c4c297a2fbd0ae1bfe2a37ce2f836607b2caf42634cff0b0fe1116542e71f056de12e3472724db04f1c5174c0deb47c2bd64fb756b4bdaef48935707 SHA512 b1c67381bb8b71d268c6e68c95cc5e2d64411ce351506de96d31850b879f7777fbc1cb33f3761437f84e52ae726fabbb794ebba9cf05d5200acaca07a2ebf0ac DIST ispc-1.18.0.tar.gz 19469764 BLAKE2B dd95ec177120899066d5539add0f35685d73f65512e8be1cc42cf6725741d7f307fbecefc22c4944d9be0e3659d511546b15506213f3dbb97829953507996283 SHA512 350b43876d6885ab4c5c0d49c5b44323fd258d5cf7c68fcdea774baa92589542f2caeea93c347a37f0dab3dcf14e7b3e685973b41694f08ce7a2da64dc81bf06 EBUILD ispc-1.17.0-r2.ebuild 1647 BLAKE2B 3bbd313fa23a85cea4485fbabf738b1b01b9d122f244d6fc803e85b37ea640deb79db2fe8b7e8770d758d7ac133d45fee2849dc8d81ac7983fd5ec055837e635 SHA512 b5ea8de5c77453f06a582c0a6732c19558d923265d71670f1be2fd2a5af6bc6fb2cad78ef1541a38b295a143a9ebdb08f931c75f66bf77477954719dc66cd44a -EBUILD ispc-1.18.0.ebuild 1757 BLAKE2B 323ddc0204c7ec7400264beff9338779531375704be59345b9c7a05d4b06016e10aaca110e29aa86df8df320b1ae3235ae7318b6da0304e9c0810cfd36f7d5c6 SHA512 15ee87c9229562c65598762dae831678b7d0a8908ee898e594b256632c44026e11eeff64f844d09f13a5751c97d633b8d38835a75511346ce797f0867fdf0ddb -EBUILD ispc-9999.ebuild 1648 BLAKE2B 7f0b26c1b4ccfeccfa890d7e966c1c39796706852b3d50289d45725dc64c2172487d155574b5d648d9ccdefdf2fea992cd4d921a292127c9897b25a02cc47541 SHA512 c5acd4eb5f00aed9871534209c17bee053692efc47aa3566cfcd637f546601bc84b02b1d666f9900e18f4fea645d287306d78b86d72c50610bd63e1a8133faef +EBUILD ispc-1.18.0.ebuild 1760 BLAKE2B edbf2f8025e123d8583446c4a70c4c50813c211ad2e97dfa2d67721a9362ea4e6edf1a42542b9cf33a515b924c422a1cca51697108007aca0d3afc77922e2897 SHA512 61119b85df7bc9146c526b1c30c3a208a6d25f97f6aae311c011fd674e8e8742e7e03a2263cf36c1c7edf672b3523c768d6629b84f09787e6c1000a37afc4697 +EBUILD ispc-9999.ebuild 1648 BLAKE2B 56880e3e248f4076448c04fa4b7110512e70def2543db428fd9f7be0143edc9d067ed43f00de35784c1d287a8818fee0058c9dc9c75e460fce96f1f46984a725 SHA512 7e8ad11ea8422f1f7d551643c6d247646d2d52da99868f5aa5b464638ee2c55da89fce97d501fe21337c814c6116eac518ef88568222d08897ee0e107ccf3eaa MISC metadata.xml 242 BLAKE2B ec655bbb26e5d545a7b25a9906e315b54a18cca56613207ce76c9e002fb8968e269627e75639053d7da3c46d8ba34296129458adcad9a561414628e8957d2d9e SHA512 7702a5b2bfe0d81904e069fa097af3c739a21ffad9b03cf9931e398dc904d10501854cc2605fb34415f3f13e58a990b7ff8c3aa803f981889c53b25cc23c6115 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" |