summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-07-29 18:50:02 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-07-29 18:52:40 +0200
commit36d443c5e4f5e8a370b30b81107dc806b13eeec7 (patch)
treebfd3e1b63c5a2fc4ee4345deb2ab7692e9c024f3 /dev-lang/ispc
parentprofiles: Mask unmaintained, dead upstream packages for removal (diff)
downloadgentoo-36d443c5e4f5e8a370b30b81107dc806b13eeec7.tar.gz
gentoo-36d443c5e4f5e8a370b30b81107dc806b13eeec7.tar.bz2
gentoo-36d443c5e4f5e8a370b30b81107dc806b13eeec7.zip
dev-lang/ispc: Remove 1.9.2, [QA] drop utterly duplicate patches
Closes: https://bugs.gentoo.org/670628 Closes: https://bugs.gentoo.org/667624 Closes: https://bugs.gentoo.org/652442 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-lang/ispc')
-rw-r--r--dev-lang/ispc/Manifest1
-rw-r--r--dev-lang/ispc/files/ispc-9999-cmake-gentoo-release.patch13
-rw-r--r--dev-lang/ispc/files/ispc-9999-llvm-10.patch106
-rw-r--r--dev-lang/ispc/files/ispc-9999-werror.patch13
-rw-r--r--dev-lang/ispc/ispc-1.9.2.ebuild52
-rw-r--r--dev-lang/ispc/ispc-9999.ebuild6
6 files changed, 3 insertions, 188 deletions
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index 09380cb968c4..b1de2c9d7ee4 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -1,2 +1 @@
DIST ispc-1.13.0.tar.gz 19202295 BLAKE2B 5fae81429acbda0d65d33e56609d05fb8b5a7db6dd0af5ff779d1e8954f6a98d1fcb0f7ecf0c1b9813630026557c21c2a70bfc87ed75959a8bd24e06fcd2e351 SHA512 d23c127beb9bb17e1ad2509f9ad51dd660c473458b939a6b64ca7f6319b3c2f25318ea2ceac00e4100a059f3f67fb97b6973f18e3432c82ff9691f2a08d15d5d
-DIST ispc-1.9.2.tar.gz 19283765 BLAKE2B 500cca8a69a78ad9a21dc1e39dcb3ed01730e78deed61e4871ce5a9761829c80ac7b1b987d8e8a48c34b67ac96692b2c5026cfb5059a32c71e228c73550584eb SHA512 77a66086cbfd6c4dc855b3137a270cc40f24829255639aee5f562b0831c21938157667b20cfadc660cd67525c47e2e73b46692f7a11bf0c834dc60b69d40d76d
diff --git a/dev-lang/ispc/files/ispc-9999-cmake-gentoo-release.patch b/dev-lang/ispc/files/ispc-9999-cmake-gentoo-release.patch
deleted file mode 100644
index b89e61504008..000000000000
--- a/dev-lang/ispc/files/ispc-9999-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-9999-llvm-10.patch b/dev-lang/ispc/files/ispc-9999-llvm-10.patch
deleted file mode 100644
index 6911a76d9e18..000000000000
--- a/dev-lang/ispc/files/ispc-9999-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>
- #include <map>
- #include <set>
- #include <vector>
-@@ -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/files/ispc-9999-werror.patch b/dev-lang/ispc/files/ispc-9999-werror.patch
deleted file mode 100644
index 3fa144b78dbc..000000000000
--- a/dev-lang/ispc/files/ispc-9999-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/ispc-1.9.2.ebuild b/dev-lang/ispc/ispc-1.9.2.ebuild
deleted file mode 100644
index d1c2c2331127..000000000000
--- a/dev-lang/ispc/ispc-1.9.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit toolchain-funcs python-any-r1
-
-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"
- KEYWORDS=""
-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-3.0:*
- >=sys-devel/llvm-3.0:*
- "
-DEPEND="
- ${RDEPEND}
- ${PYTHON_DEPS}
- sys-devel/bison
- sys-devel/flex
- "
-
-src_compile() {
- #make all slient commands ("@") verbose and remove -Werror (ispc/ispc#1295)
- sed -e '/^\t@/s/@//' -e 's/-Werror//' -i Makefile || die
- emake LDFLAGS="${LDFLAGS}" OPT="${CXXFLAGS}" CXX="$(tc-getCXX)" CPP="$(tc-getCPP)"
-}
-
-src_install() {
- dobin ispc
- dodoc README.rst
-
- if use examples; then
- insinto "/usr/share/doc/${PF}/examples"
- docompress -x "/usr/share/doc/${PF}/examples"
- doins -r examples/*
- fi
-}
diff --git a/dev-lang/ispc/ispc-9999.ebuild b/dev-lang/ispc/ispc-9999.ebuild
index 244bb728565a..d2a75a6652a1 100644
--- a/dev-lang/ispc/ispc-9999.ebuild
+++ b/dev-lang/ispc/ispc-9999.ebuild
@@ -35,9 +35,9 @@ DEPEND="
"
PATCHES=(
- "${FILESDIR}/${P}-cmake-gentoo-release.patch"
- "${FILESDIR}/${P}-llvm-10.patch"
- "${FILESDIR}/${P}-werror.patch"
+ "${FILESDIR}/${PN}-1.13.0-cmake-gentoo-release.patch"
+ "${FILESDIR}/${PN}-1.13.0-llvm-10.patch"
+ "${FILESDIR}/${PN}-1.13.0-werror.patch"
)
src_configure() {