From e748ba9741f6540f4675c23e3e37b73e822c13a4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 May 2021 20:59:14 +0100 Subject: gentoo resync : 31.05.2021 --- dev-lang/ispc/Manifest | 4 ++- dev-lang/ispc/files/ispc-9999-llvm.patch | 39 ++++++++++++++++++++++++++++++ dev-lang/ispc/files/ispc-9999-werror.patch | 13 ++++++++++ dev-lang/ispc/ispc-9999.ebuild | 19 +++++++++------ 4 files changed, 66 insertions(+), 9 deletions(-) create mode 100644 dev-lang/ispc/files/ispc-9999-llvm.patch create mode 100644 dev-lang/ispc/files/ispc-9999-werror.patch (limited to 'dev-lang/ispc') diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest index 6634f1c38de5..922283801261 100644 --- a/dev-lang/ispc/Manifest +++ b/dev-lang/ispc/Manifest @@ -1,7 +1,9 @@ AUX ispc-1.13.0-cmake-gentoo-release.patch 507 BLAKE2B e67be17f40dce55895ce307bd5383ad3f9dc8ec460c7195e23ce344f3a0324c53f9f69b695b6feb70d18da813d5d855d675a00e8dfd3e651aaaebf510de1138b SHA512 bdfd7d3f023ace4a0209201e05b7528e50cff644794bc48b5160d8051c2d70dad6690e509ca69102b08843ebb5fd7a76241954b22a0bb1f3c4714708df405d65 AUX ispc-1.13.0-werror.patch 737 BLAKE2B 13ac7eb6f9db4a7379d5acd1f0fa8f44ddca7290329c1231c1b515b374438f5119d9e129c8b5326cfd084956a4ba005549bd30b67a9f64034e0ade8218b8f50c SHA512 254e0e21db59f2b8768d0953c9b0950bb7d860ea9eab7c4d450b3b006382959ab60eb650df9c1ddd4fda7628d5040f7b4779369cf67a99012d5fc2c4b9ef2f7b AUX ispc-1.14.0-llvm-10.patch 4695 BLAKE2B 91488c154a2034487c61df07467414ab83f0a15073332dc8261d619a5dab9ad9c0a6708918bce6491d2a88ca83a5ec8b9edf3c90634b8b91233175e1f41f5163 SHA512 0ee052711aacb01dafd182b3bf95f6d88e2124a7d5beb38bb2173acdcb23eb3f04fc0514c0edf6e286091bc2f855ccc192e38c2f1c4e38fb631bb5fd6a9b223f +AUX ispc-9999-llvm.patch 1410 BLAKE2B 77027da9032fa230c72d8608c2a6cd63c33601e17acab0260101c64dbb50a0aa3cc30702c4480ae5d63e95ec3e962e28bdbbd90cd72f4e91d30dc364b82367b6 SHA512 116078d5ab99c849584cc4ece8dc3ebc817221a2377e26083071e206b5e83c4f3ed594f84b86c9659ef86a497bd3cd058ee32138238e12e6aa9dac0f11cf1440 +AUX ispc-9999-werror.patch 913 BLAKE2B cc24257a03c6b1a69c7b4ccddf6df61ca864f6fea614fe5fc479c368a94ae800bee0d621d3fe33b70aca680a85ae0f5140bd789d5c2b83143730b305d6da3296 SHA512 5397abccaeb22aa435c66b192195f991d7a94ab3109ae191ca0e1b2a011485488cfa892aa980a329b17b6f5f432f7613b9057e53e0aa0d0afb4a086bbe7af527 DIST ispc-1.14.1.tar.gz 19454189 BLAKE2B 615698e64ffbd2c82808d6ddd0b5b90f7c52bb8c202a04364d63af26f0e062631f4a8ad01895c1a4f1a8f11e7f91aec381354ddd873d0a4f2908431dcaabe383 SHA512 468e8a44408047ba7b43dc4baf05c2659093b986e131ebe973954ff3b9cf707a4ed22c705b6e01a9abc9a3911669ab31cd191449442c4ac73112a1297da32c5e EBUILD ispc-1.14.1.ebuild 1753 BLAKE2B 98161585a17a4ce4e13c9eb29b668077a4f23df5505b8d55f509b7df0f73bbde3fc11a897f57574d1b0a80b335604e431897d5a76fd8f064351ad548bdfe8905 SHA512 1184f4ae6e085842ae198a9c4ef6a5965412565622bc9f3cf41ea32dbcee1f6fadde26bacf9fd545ece43deea0086eceb669eb6cb008af0e5b2196cf908f7fbd -EBUILD ispc-9999.ebuild 1741 BLAKE2B b93ad208adb93b50dcf7469ed64f8db84714a7bb2289142a5b975b77cfe5765c32fe0671d422e687c0f282050268666e57b3a3a39fc5a89774a6247df943ebaf SHA512 555d0c3a75d519d7886a7730f41be0bcfa9823bc8a74349bffd61478789c28d19a5a5e11577f9057c14be795e51bf2a4d4bdbce777387bca9f1f5c9d3cb131aa +EBUILD ispc-9999.ebuild 1785 BLAKE2B 0c75f33746be19cbdaaa637133664b0dd0093666757645121e62b5844709e6d8c263cf137fdd9d320be5397af32935c765de11271e593569c1863ffb14139633 SHA512 98cd7f154b4ed376c74041a02fd59d66385754fa3f0588c3c5a0ff2ab11dcb5d0dd458a1ec2104b5c99f13da8de8c3417111ff359c7ed4f2e1041ae28c93e0a8 MISC metadata.xml 241 BLAKE2B 26c98e9f68d20d2275e5a9aef2d4c1cf74bd65e331e2e4869297a0a4d2b4dccab2e7709ad9ff844b973a97da0ee6eaae4fe17c6446ca06ed63f46804c8af5a82 SHA512 b9bb777e446879d214fab1adfa4b9dca1d3bd11c4084dfa449fb16d1896da27b85e11b869ed76b7b492814a1899b5fb00dbbeded579a0ed00666d4b204ddee14 diff --git a/dev-lang/ispc/files/ispc-9999-llvm.patch b/dev-lang/ispc/files/ispc-9999-llvm.patch new file mode 100644 index 000000000000..7303ac0fd6e8 --- /dev/null +++ b/dev-lang/ispc/files/ispc-9999-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 + #include + #include ++#include + + #ifdef ISPC_GENX_ENABLED + #include diff --git a/dev-lang/ispc/files/ispc-9999-werror.patch b/dev-lang/ispc/files/ispc-9999-werror.patch new file mode 100644 index 000000000000..0e860a95de26 --- /dev/null +++ b/dev-lang/ispc/files/ispc-9999-werror.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 13e66268..27ff8364 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -352,7 +352,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE + set_source_files_properties(${FLEX_OUTPUT} PROPERTIES COMPILE_FLAGS "/wd4005 /wd4003") + set_source_files_properties(${BISON_OUTPUT} PROPERTIES COMPILE_FLAGS "/wd4005 /wd4065") + else() +- target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-sign-compare -Wno-unused-function -Werror ${LLVM_CPP_FLAGS}) ++ target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-sign-compare -Wno-unused-function ${LLVM_CPP_FLAGS}) + # The change implementing -Wno-unused-but-set-variable in clang was reverted, so commenting out for now. + #if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "13.0.0") + # set_source_files_properties(${BISON_CPP_OUTPUT} PROPERTIES COMPILE_FLAGS "-Wno-unused-but-set-variable") diff --git a/dev-lang/ispc/ispc-9999.ebuild b/dev-lang/ispc/ispc-9999.ebuild index aeb4e572cb40..23b20156fd2b 100644 --- a/dev-lang/ispc/ispc-9999.ebuild +++ b/dev-lang/ispc/ispc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,10 +7,10 @@ PYTHON_COMPAT=( python3_{7,8,9} ) inherit cmake toolchain-funcs python-any-r1 llvm -LLVM_MAX_SLOT=10 +LLVM_MAX_SLOT=12 DESCRIPTION="Intel SPMD Program Compiler" -HOMEPAGE="https://ispc.github.com/" +HOMEPAGE="https://ispc.github.io/" if [[ ${PV} = *9999 ]]; then inherit git-r3 @@ -24,7 +24,7 @@ LICENSE="BSD BSD-2 UoI-NCSA" SLOT="0" IUSE="examples" -RDEPEND="