1 |
commit: 6d7f758287a022cd45049c37930d7ab5b4938526 |
2 |
Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Sep 5 21:44:32 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 10 00:42:13 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d7f7582 |
7 |
|
8 |
dev-lang/ispc: Drop old 1.13.0 ebuild |
9 |
|
10 |
Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/17282 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
dev-lang/ispc/Manifest | 1 - |
15 |
dev-lang/ispc/files/ispc-1.13.0-llvm-10.patch | 106 -------------------------- |
16 |
dev-lang/ispc/ispc-1.13.0.ebuild | 59 -------------- |
17 |
3 files changed, 166 deletions(-) |
18 |
|
19 |
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest |
20 |
index 886b57a17be..4572d984a64 100644 |
21 |
--- a/dev-lang/ispc/Manifest |
22 |
+++ b/dev-lang/ispc/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST ispc-1.13.0.tar.gz 19202295 BLAKE2B 5fae81429acbda0d65d33e56609d05fb8b5a7db6dd0af5ff779d1e8954f6a98d1fcb0f7ecf0c1b9813630026557c21c2a70bfc87ed75959a8bd24e06fcd2e351 SHA512 d23c127beb9bb17e1ad2509f9ad51dd660c473458b939a6b64ca7f6319b3c2f25318ea2ceac00e4100a059f3f67fb97b6973f18e3432c82ff9691f2a08d15d5d |
25 |
DIST ispc-1.14.0.tar.gz 19454030 BLAKE2B 3bd494f4357c7c756c6bc63c76ced37feb83e8f6f73b0adc9e432f37e905efe0f7fe5f8b153d3ccff3ac9f826d0c76f7c33f2a151887ab900088bab95e626856 SHA512 a1325a26804f08a357c84cb1d7266bd56d6d135314985337e057e39ddf556a7332922926e9d10db817048a8d5b491467de7261029a0a46726f330a00791ee8f8 |
26 |
|
27 |
diff --git a/dev-lang/ispc/files/ispc-1.13.0-llvm-10.patch b/dev-lang/ispc/files/ispc-1.13.0-llvm-10.patch |
28 |
deleted file mode 100644 |
29 |
index 6911a76d9e1..00000000000 |
30 |
--- a/dev-lang/ispc/files/ispc-1.13.0-llvm-10.patch |
31 |
+++ /dev/null |
32 |
@@ -1,106 +0,0 @@ |
33 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
34 |
-index 13e66268..27ff8364 100644 |
35 |
---- a/CMakeLists.txt |
36 |
-+++ b/CMakeLists.txt |
37 |
-@@ -218,7 +218,7 @@ if (WASM_ENABLED) |
38 |
- list(APPEND ISPC_TARGETS wasm-i32x4) |
39 |
- endif() |
40 |
- |
41 |
--set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex) |
42 |
-+set(CLANG_LIBRARY_LIST clang clang-cpp) |
43 |
- set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option) |
44 |
- |
45 |
- if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "10.0.0") |
46 |
-@@ -402,11 +402,8 @@ if (ISPC_USE_ASAN) |
47 |
- endif() |
48 |
- |
49 |
- # Link against Clang libraries |
50 |
--foreach(clangLib ${CLANG_LIBRARY_LIST}) |
51 |
-- find_library(${clangLib}Path NAMES ${clangLib} HINTS ${LLVM_LIBRARY_DIRS}) |
52 |
-- list(APPEND CLANG_LIBRARY_FULL_PATH_LIST ${${clangLib}Path}) |
53 |
--endforeach() |
54 |
--target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_FULL_PATH_LIST}) |
55 |
-+find_package(Clang REQUIRED) |
56 |
-+target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_LIST}) |
57 |
- |
58 |
- # Link against LLVM libraries |
59 |
- target_link_libraries(${PROJECT_NAME} ${LLVM_LIBRARY_LIST}) |
60 |
-diff --git a/src/llvmutil.cpp b/src/llvmutil.cpp |
61 |
-index 06fab989..57a7130f 100644 |
62 |
---- a/src/llvmutil.cpp |
63 |
-+++ b/src/llvmutil.cpp |
64 |
-@@ -42,6 +42,7 @@ |
65 |
- #include <llvm/IR/BasicBlock.h> |
66 |
- #include <llvm/IR/Instructions.h> |
67 |
- #include <llvm/IR/Module.h> |
68 |
-+#include <llvm/Support/raw_ostream.h> |
69 |
- #include <map> |
70 |
- #include <set> |
71 |
- #include <vector> |
72 |
-@@ -1394,7 +1395,7 @@ static void lDumpValue(llvm::Value *v, std::set<llvm::Value *> &done) { |
73 |
- return; |
74 |
- |
75 |
- fprintf(stderr, " "); |
76 |
-- v->dump(); |
77 |
-+ v->print(llvm::outs(), false); |
78 |
- done.insert(v); |
79 |
- |
80 |
- if (inst == NULL) |
81 |
-diff --git a/src/opt.cpp b/src/opt.cpp |
82 |
-index d78ac374..a607594a 100644 |
83 |
---- a/src/opt.cpp |
84 |
-+++ b/src/opt.cpp |
85 |
-@@ -142,7 +142,7 @@ static llvm::Pass *CreateFixBooleanSelectPass(); |
86 |
- getenv("FUNC"), strlen(getenv("FUNC")))))) { \ |
87 |
- fprintf(stderr, "Start of " NAME "\n"); \ |
88 |
- fprintf(stderr, "---------------\n"); \ |
89 |
-- bb.dump(); \ |
90 |
-+ bb.print(llvm::outs(), false); \ |
91 |
- fprintf(stderr, "---------------\n\n"); \ |
92 |
- } else /* eat semicolon */ |
93 |
- |
94 |
-@@ -152,7 +152,7 @@ static llvm::Pass *CreateFixBooleanSelectPass(); |
95 |
- getenv("FUNC"), strlen(getenv("FUNC")))))) { \ |
96 |
- fprintf(stderr, "End of " NAME " %s\n", modifiedAny ? "** CHANGES **" : ""); \ |
97 |
- fprintf(stderr, "---------------\n"); \ |
98 |
-- bb.dump(); \ |
99 |
-+ bb.print(llvm::outs(), false); \ |
100 |
- fprintf(stderr, "---------------\n\n"); \ |
101 |
- } else /* eat semicolon */ |
102 |
- #else |
103 |
-@@ -453,7 +453,7 @@ void Optimize(llvm::Module *module, int optLevel) { |
104 |
- #ifndef ISPC_NO_DUMPS |
105 |
- if (g->debugPrint) { |
106 |
- printf("*** Code going into optimization ***\n"); |
107 |
-- module->dump(); |
108 |
-+ module->print(llvm::outs(), nullptr); |
109 |
- } |
110 |
- #endif |
111 |
- DebugPassManager optPM; |
112 |
-@@ -666,7 +666,7 @@ void Optimize(llvm::Module *module, int optLevel) { |
113 |
- #ifndef ISPC_NO_DUMPS |
114 |
- if (g->debugPrint) { |
115 |
- printf("\n*****\nFINAL OUTPUT\n*****\n"); |
116 |
-- module->dump(); |
117 |
-+ module->print(llvm::outs(), nullptr); |
118 |
- } |
119 |
- #endif |
120 |
- } |
121 |
-@@ -4256,7 +4256,7 @@ char DebugPass::ID = 0; |
122 |
- bool DebugPass::runOnModule(llvm::Module &module) { |
123 |
- fprintf(stderr, "%s", str_output); |
124 |
- fflush(stderr); |
125 |
-- module.dump(); |
126 |
-+ module.print(llvm::outs(), nullptr); |
127 |
- return true; |
128 |
- } |
129 |
- |
130 |
-@@ -4303,7 +4303,7 @@ void DebugPassFile::run(llvm::Module &module, bool init) { |
131 |
- snprintf(fname, sizeof(fname), "%s_%d_%s.ll", init ? "init" : "ir", pnum, sanitize(std::string(pname)).c_str()); |
132 |
- llvm::raw_fd_ostream OS(fname, EC, llvm::sys::fs::F_None); |
133 |
- Assert(!EC && "IR dump file creation failed!"); |
134 |
-- module.print(OS, 0); |
135 |
-+ module.print(OS, nullptr); |
136 |
- } |
137 |
- |
138 |
- bool DebugPassFile::runOnModule(llvm::Module &module) { |
139 |
|
140 |
diff --git a/dev-lang/ispc/ispc-1.13.0.ebuild b/dev-lang/ispc/ispc-1.13.0.ebuild |
141 |
deleted file mode 100644 |
142 |
index 33144034d36..00000000000 |
143 |
--- a/dev-lang/ispc/ispc-1.13.0.ebuild |
144 |
+++ /dev/null |
145 |
@@ -1,59 +0,0 @@ |
146 |
-# Copyright 1999-2020 Gentoo Authors |
147 |
-# Distributed under the terms of the GNU General Public License v2 |
148 |
- |
149 |
-EAPI=7 |
150 |
- |
151 |
-PYTHON_COMPAT=( python2_7 ) |
152 |
- |
153 |
-inherit cmake toolchain-funcs python-any-r1 |
154 |
- |
155 |
-DESCRIPTION="Intel SPMD Program Compiler" |
156 |
-HOMEPAGE="https://ispc.github.com/" |
157 |
- |
158 |
-if [[ ${PV} = *9999 ]]; then |
159 |
- inherit git-r3 |
160 |
- EGIT_REPO_URI="https://github.com/ispc/ispc.git" |
161 |
- KEYWORDS="" |
162 |
-else |
163 |
- SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
164 |
- KEYWORDS="~amd64 ~x86" |
165 |
-fi |
166 |
- |
167 |
-LICENSE="BSD BSD-2 UoI-NCSA" |
168 |
-SLOT="0" |
169 |
-IUSE="examples" |
170 |
- |
171 |
-RDEPEND=" |
172 |
- >=sys-devel/clang-3.0:* |
173 |
- >=sys-devel/llvm-3.0:* |
174 |
- " |
175 |
-DEPEND=" |
176 |
- ${RDEPEND} |
177 |
- ${PYTHON_DEPS} |
178 |
- sys-devel/bison |
179 |
- sys-devel/flex |
180 |
- " |
181 |
- |
182 |
-PATCHES=( |
183 |
- "${FILESDIR}/${P}-cmake-gentoo-release.patch" |
184 |
- "${FILESDIR}/${P}-llvm-10.patch" |
185 |
- "${FILESDIR}/${P}-werror.patch" |
186 |
-) |
187 |
- |
188 |
-src_configure() { |
189 |
- local mycmakeargs=( |
190 |
- "-DARM_ENABLED=$(usex arm)" |
191 |
- ) |
192 |
- cmake_src_configure |
193 |
-} |
194 |
- |
195 |
-src_install() { |
196 |
- dobin "${BUILD_DIR}"/bin/ispc |
197 |
- dodoc README.md |
198 |
- |
199 |
- if use examples; then |
200 |
- insinto "/usr/share/doc/${PF}/examples" |
201 |
- docompress -x "/usr/share/doc/${PF}/examples" |
202 |
- doins -r "${BUILD_DIR}"/examples/* |
203 |
- fi |
204 |
-} |