diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-07-28 10:27:13 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-07-28 10:27:13 +0100 |
commit | f4fc10428424904caf2035cffc442195cb088b2c (patch) | |
tree | 72f320d5963e55586cfdeed2b14c72b8191b6327 /dev-lang/ispc | |
parent | fbd9734cedfe790955100b8e4ab3613457d77b1a (diff) |
gentoo resync : 28.07.2021
Diffstat (limited to 'dev-lang/ispc')
-rw-r--r-- | dev-lang/ispc/Manifest | 5 | ||||
-rw-r--r-- | dev-lang/ispc/files/ispc-1.13.0-cmake-gentoo-release.patch | 13 | ||||
-rw-r--r-- | dev-lang/ispc/files/ispc-1.13.0-werror.patch | 13 | ||||
-rw-r--r-- | dev-lang/ispc/files/ispc-1.14.0-llvm-10.patch | 106 | ||||
-rw-r--r-- | dev-lang/ispc/ispc-1.14.1.ebuild | 82 |
5 files changed, 0 insertions, 219 deletions
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest index 86391a86c8c2..c62bcf383f69 100644 --- a/dev-lang/ispc/Manifest +++ b/dev-lang/ispc/Manifest @@ -1,10 +1,5 @@ -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 -DIST ispc-1.14.1.tar.gz 19454189 BLAKE2B 615698e64ffbd2c82808d6ddd0b5b90f7c52bb8c202a04364d63af26f0e062631f4a8ad01895c1a4f1a8f11e7f91aec381354ddd873d0a4f2908431dcaabe383 SHA512 468e8a44408047ba7b43dc4baf05c2659093b986e131ebe973954ff3b9cf707a4ed22c705b6e01a9abc9a3911669ab31cd191449442c4ac73112a1297da32c5e DIST ispc-1.16.0.tar.gz 19548153 BLAKE2B 9b6d9329430d59041a76c20332b527560afa47a5585652abdf93aedb7907483d1647c829f2bd3f396cd53301bc79367cd91606b90a543fa8bec2f6ab34452989 SHA512 8469db4e3e9834477345b431162543f1c8e680aa9834c9a50239781dc7febfdde0561c2f13d1387e37f95a18c4376a85cb9cbae33cb614dc8977dfc9f47da215 -EBUILD ispc-1.14.1.ebuild 1753 BLAKE2B 98161585a17a4ce4e13c9eb29b668077a4f23df5505b8d55f509b7df0f73bbde3fc11a897f57574d1b0a80b335604e431897d5a76fd8f064351ad548bdfe8905 SHA512 1184f4ae6e085842ae198a9c4ef6a5965412565622bc9f3cf41ea32dbcee1f6fadde26bacf9fd545ece43deea0086eceb669eb6cb008af0e5b2196cf908f7fbd EBUILD ispc-1.16.0.ebuild 1622 BLAKE2B 927a3d1d9877f703f45f715862cb3102b3ec507b1d252831cacaaecdbcd114e1e8769b41e917618c6db0ea0d31d9f8515afd400c394a6b56f3933836dd994cf2 SHA512 5f2d8f7aadeec0a31ed92fcb6d399768ed0ec50a46c2d8eb726c6a30881492f50dde2f3f1c0e48ef3cd989accd6a708158e7bfbdaad1a33e67326e84ffd7827a EBUILD ispc-9999.ebuild 1622 BLAKE2B 927a3d1d9877f703f45f715862cb3102b3ec507b1d252831cacaaecdbcd114e1e8769b41e917618c6db0ea0d31d9f8515afd400c394a6b56f3933836dd994cf2 SHA512 5f2d8f7aadeec0a31ed92fcb6d399768ed0ec50a46c2d8eb726c6a30881492f50dde2f3f1c0e48ef3cd989accd6a708158e7bfbdaad1a33e67326e84ffd7827a MISC metadata.xml 241 BLAKE2B 26c98e9f68d20d2275e5a9aef2d4c1cf74bd65e331e2e4869297a0a4d2b4dccab2e7709ad9ff844b973a97da0ee6eaae4fe17c6446ca06ed63f46804c8af5a82 SHA512 b9bb777e446879d214fab1adfa4b9dca1d3bd11c4084dfa449fb16d1896da27b85e11b869ed76b7b492814a1899b5fb00dbbeded579a0ed00666d4b204ddee14 diff --git a/dev-lang/ispc/files/ispc-1.13.0-cmake-gentoo-release.patch b/dev-lang/ispc/files/ispc-1.13.0-cmake-gentoo-release.patch deleted file mode 100644 index b89e61504008..000000000000 --- a/dev-lang/ispc/files/ispc-1.13.0-cmake-gentoo-release.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 13e66268..27ff8364 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -137,7 +137,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin ) - - if(CMAKE_BUILD_TYPE) - # Validate build type -- set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo") -+ set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;Gentoo") - - string(FIND "${CONFIGURATION_TYPES}" "${CMAKE_BUILD_TYPE}" MATCHED_CONFIG) - if (${MATCHED_CONFIG} EQUAL -1) diff --git a/dev-lang/ispc/files/ispc-1.13.0-werror.patch b/dev-lang/ispc/files/ispc-1.13.0-werror.patch deleted file mode 100644 index 3fa144b78dbc..000000000000 --- a/dev-lang/ispc/files/ispc-1.13.0-werror.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 - ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}) - # Compile options - if (UNIX) -- 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}) - # Security options - target_compile_options(${PROJECT_NAME} PRIVATE -fstack-protector -fdata-sections -ffunction-sections - -Wformat -Wformat-security -fpie -fwrapv) diff --git a/dev-lang/ispc/files/ispc-1.14.0-llvm-10.patch b/dev-lang/ispc/files/ispc-1.14.0-llvm-10.patch deleted file mode 100644 index 7a76d99aca81..000000000000 --- a/dev-lang/ispc/files/ispc-1.14.0-llvm-10.patch +++ /dev/null @@ -1,106 +0,0 @@ -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) - - if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "10.0.0") -@@ -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> -@@ -1394,7 +1395,7 @@ static void lDumpValue(llvm::Value *v, std::set<llvm::Value *> &done) { - return; - - fprintf(stderr, " "); -- v->dump(); -+ v->print(llvm::outs(), false); - done.insert(v); - - if (inst == NULL) -diff --git a/src/opt.cpp b/src/opt.cpp -index d78ac374..a607594a 100644 ---- a/src/opt.cpp -+++ b/src/opt.cpp -@@ -142,7 +142,7 @@ static llvm::Pass *CreateFixBooleanSelectPass(); - getenv("FUNC"), strlen(getenv("FUNC")))))) { \ - fprintf(stderr, "Start of " NAME "\n"); \ - fprintf(stderr, "---------------\n"); \ -- bb.dump(); \ -+ bb.print(llvm::outs(), false); \ - fprintf(stderr, "---------------\n\n"); \ - } else /* eat semicolon */ - -@@ -152,7 +152,7 @@ static llvm::Pass *CreateFixBooleanSelectPass(); - getenv("FUNC"), strlen(getenv("FUNC")))))) { \ - fprintf(stderr, "End of " NAME " %s\n", modifiedAny ? "** CHANGES **" : ""); \ - fprintf(stderr, "---------------\n"); \ -- bb.dump(); \ -+ bb.print(llvm::outs(), false); \ - fprintf(stderr, "---------------\n\n"); \ - } else /* eat semicolon */ - #else -@@ -453,7 +453,7 @@ void Optimize(llvm::Module *module, int optLevel) { - #ifndef ISPC_NO_DUMPS - if (g->debugPrint) { - printf("*** Code going into optimization ***\n"); -- module->dump(); -+ module->print(llvm::outs(), nullptr); - } - #endif - DebugPassManager optPM; -@@ -666,7 +666,7 @@ void Optimize(llvm::Module *module, int optLevel) { - #ifndef ISPC_NO_DUMPS - if (g->debugPrint) { - printf("\n*****\nFINAL OUTPUT\n*****\n"); -- module->dump(); -+ module->print(llvm::outs(), nullptr); - } - #endif - } -@@ -4256,7 +4256,7 @@ char DebugPass::ID = 0; - bool DebugPass::runOnModule(llvm::Module &module) { - fprintf(stderr, "%s", str_output); - fflush(stderr); -- module.dump(); -+ module.print(llvm::outs(), nullptr); - return true; - } - -@@ -4303,7 +4303,7 @@ void DebugPassFile::run(llvm::Module &module, bool init) { - snprintf(fname, sizeof(fname), "%s_%d_%s.ll", init ? "init" : "ir", pnum, sanitize(std::string(pname)).c_str()); - llvm::raw_fd_ostream OS(fname, EC, llvm::sys::fs::F_None); - Assert(!EC && "IR dump file creation failed!"); -- module.print(OS, 0); -+ module.print(OS, nullptr); - } - - bool DebugPassFile::runOnModule(llvm::Module &module) { diff --git a/dev-lang/ispc/ispc-1.14.1.ebuild b/dev-lang/ispc/ispc-1.14.1.ebuild deleted file mode 100644 index d05dbeb20bd0..000000000000 --- a/dev-lang/ispc/ispc-1.14.1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit cmake toolchain-funcs python-any-r1 llvm - -LLVM_MAX_SLOT=10 - -DESCRIPTION="Intel SPMD Program Compiler" -HOMEPAGE="https://ispc.github.com/" - -if [[ ${PV} = *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ispc/ispc.git" -else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="BSD BSD-2 UoI-NCSA" -SLOT="0" -IUSE="examples" - -RDEPEND="<sys-devel/clang-11:=" - -DEPEND=" - ${RDEPEND} - ${PYTHON_DEPS} - " -BDEPEND=" - sys-devel/bison - sys-devel/flex - " - -PATCHES=( - "${FILESDIR}/${PN}-1.13.0-cmake-gentoo-release.patch" - "${FILESDIR}/${PN}-1.14.0-llvm-10.patch" - "${FILESDIR}/${PN}-1.13.0-werror.patch" -) - -llvm_check_deps() { - has_version -d "sys-devel/clang:${LLVM_SLOT}" -} - -src_prepare() { - if use amd64; then - # On amd64 systems, build system enables x86/i686 build too. - # This ebuild doesn't even have multilib support, nor need it. - # https://bugs.gentoo.org/730062 - elog "Removing auto-x86 build on amd64" - sed -i -e 's:set(target_arch "i686"):return():' cmake/GenerateBuiltins.cmake || die - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - "-DARM_ENABLED=$(usex arm)" - "-DCMAKE_SKIP_RPATH=ON" - ) - cmake_src_configure -} - -src_install() { - dobin "${BUILD_DIR}"/bin/ispc - dodoc README.md - - if use examples; then - insinto "/usr/share/doc/${PF}/examples" - docompress -x "/usr/share/doc/${PF}/examples" - doins -r "${BUILD_DIR}"/examples/* - fi -} - -src_test() { - # Inject path to prevent using system ispc - PATH="${BUILD_DIR}/bin:${PATH}" ${EPYTHON} run_tests.py || die "Testing failed under ${EPYTHON}" -} |