Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/files/, dev-util/intel-graphics-compiler/
Date: Tue, 21 Sep 2021 18:26:39
Message-Id: 1632248752.1f593e6c6545c9447d2adc9c03b166b6cd658ce5.conikost@gentoo
1 commit: 1f593e6c6545c9447d2adc9c03b166b6cd658ce5
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 21 18:05:52 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 21 18:25:52 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f593e6c
7
8 dev-util/intel-graphics-compiler: drop old versions
9
10 Closes: https://bugs.gentoo.org/774009
11 Package-Manager: Portage-3.0.22, Repoman-3.0.3
12 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
13
14 dev-util/intel-graphics-compiler/Manifest | 4 --
15 ...cs-compiler-1.0.4111-opencl-clang_version.patch | 27 --------
16 .../intel-graphics-compiler-1.0.4111.ebuild | 61 ----------------
17 .../intel-graphics-compiler-1.0.4944.ebuild | 72 -------------------
18 .../intel-graphics-compiler-1.0.5353.ebuild | 73 -------------------
19 .../intel-graphics-compiler-1.0.8173.ebuild | 74 --------------------
20 .../intel-graphics-compiler-1.0.8365.ebuild | 81 ----------------------
21 .../intel-graphics-compiler-1.0.8517.ebuild | 79 ---------------------
22 8 files changed, 471 deletions(-)
23
24 diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
25 index e7569a94df0..2d2471a91dc 100644
26 --- a/dev-util/intel-graphics-compiler/Manifest
27 +++ b/dev-util/intel-graphics-compiler/Manifest
28 @@ -1,6 +1,2 @@
29 -DIST intel-graphics-compiler-1.0.4111.tar.gz 5781246 BLAKE2B 6fe47422b31b0c73d24c3cef1265772927a57751bf5648f862f7c73528f2174268fdb2271c30c49ab038b4dfbe530bc088fe727e66babc5db0a41759e7212733 SHA512 8f589ee83a27b7a8f5abcd008e36a73fb704c20c1ae17e1ef265c59641768b75a0a08f2d6f80355442fff7625154603db3ebe9be0a4ba702b45e85db434f8110
30 -DIST intel-graphics-compiler-1.0.4944.tar.gz 6632351 BLAKE2B a3d72730b8c10fd3810fdb8206d9d92da325a094627b678bb9f8d0941e29c1697994a2d98a1b49780fae62dc421e623dea4c3a7e3061347de5f5b644cfb5e105 SHA512 34fafd5387f3b86bef17511015ff1e8daef75ebdff5d1d14ff2000b58968bb502a9ec1aee988858a2992414f6cdb222e7de19c2d877f7fc8cd84a79417e9a85e
31 -DIST intel-graphics-compiler-1.0.5353.tar.gz 6642256 BLAKE2B 34b80b30f33dbd57bcea15852c80cdf8bdbf4630a7904946c7ce84481789e7db42f5216ba14140d445e9b0adbfcfe224468e462ea27768f0e8d31525ce56cde1 SHA512 e9f20e2261c5cb79d365d5d8257e8f4830b2364962c48413cc80154469db34c1c844ae5d576cbce2e3c5e5cbe22c7c3710ebd0a7fe7208e5412e81ce20077c80
32 -DIST intel-graphics-compiler-1.0.8173.tar.gz 7471884 BLAKE2B 2248a8d5f23d4578c5bd04a799af65767916b3705e16a8145149794a2cf16e5a0e16c21669336151a241cc52e7672b05eb892ac4925f2c2d0b22673af4ebf67f SHA512 bebccee0699dea48e98ddcdb320cacacda0cdcd36b68e51d932791756b0a8e2171a78cc1921ca2a092b9fe7dbd7a783d4898ada08c58bf856dd29bfc08334fa0
33 DIST intel-graphics-compiler-1.0.8365.tar.gz 7509633 BLAKE2B ffe18d18b409db36bd24215d841daaa36d5055d61b9021e385fe9178351b6a92383839e271a12d1e5017150b9697060fe37f803c5153d2f107813aeb2e7a74cf SHA512 6597afbab2c101d69e6a991b5b065ebbded7ccc6227c0ed82b6b0bd33fec26489c30a0a7a9558617578a767ca6d7382a6ab36144f4c64df742c6bd545ce991e9
34 DIST intel-graphics-compiler-1.0.8517.tar.gz 7539946 BLAKE2B 034d2e3dcfc25186e29eebfabffbca7b8a5adab1f766c7515b4a3206c9c52eca3dd766e17320ea0c40067385fc6235d92eec13f1d12909915b86fb42a7862825 SHA512 35f09d1f6b117e78814cc235d03b1f1164f11a2d2a5d188b6658677c4b759422048764e765f7690f4789dc8b8c068714a68642c2d956ccc84b387a959f9af07f
35
36 diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4111-opencl-clang_version.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4111-opencl-clang_version.patch
37 deleted file mode 100644
38 index 8996466275c..00000000000
39 --- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4111-opencl-clang_version.patch
40 +++ /dev/null
41 @@ -1,27 +0,0 @@
42 ---- a/IGC/BiFModule/CMakeLists.txt
43 -+++ b/IGC/BiFModule/CMakeLists.txt
44 -@@ -160,20 +160,10 @@
45 -
46 - if(UNIX)
47 - if(NOT ${CCLANG_BUILD_INTREE_LLVM})
48 -- # Get common clang library soname
49 -- get_target_property(CCLANG_LIB_PATH opencl-clang-lib "IMPORTED_LOCATION")
50 -- execute_process(
51 -- COMMAND readelf -d ${CCLANG_LIB_PATH}
52 -- OUTPUT_VARIABLE CCLANG_READELF_CALL)
53 -- string(REGEX MATCH "\\[${COMMON_CLANG_LIB_FULL_NAME}\\.([0-9](\\.[0-9]*)*[a-zA-Z0-9]*)\\]" CCLANG_SONAME_VERSION "${CCLANG_READELF_CALL}")
54 -- set(CCLANG_SONAME_VERSION "${CMAKE_MATCH_1}")
55 --
56 -- # Check if common clang library is newer than 5.0.0 version on which we have SPIR-V support
57 -- if("${CCLANG_SONAME_VERSION}" VERSION_GREATER "5.0.0")
58 -- set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_SONAME" "${COMMON_CLANG_LIB_FULL_NAME}.${CCLANG_SONAME_VERSION}")
59 -- else()
60 -- message(FATAL_ERROR "[IGC\\BiFModule] : Version ${CCLANG_SONAME_VERSION} of library ${COMMON_CLANG_LIB_FULL_NAME} is below version 5.0.0 (where it's starts support of SPIR-V), please upgrade this library at least to version 5.0.0")
61 -- endif()
62 -+ # Workaround for https://bugs.gentoo.org/739138 : instead of checking
63 -+ # the version of opencl-clang, have ebuilds set CCLANG_SONAME_VERSION
64 -+ # for us.
65 -+ set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_SONAME" "${COMMON_CLANG_LIB_FULL_NAME}.${CCLANG_SONAME_VERSION}")
66 - endif()
67 - if (NOT CCLANG_FROM_SYSTEM)
68 - install(FILES $<TARGET_FILE:opencl-clang-lib> DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT igc-opencl)
69
70 diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
71 deleted file mode 100644
72 index 2ce45fda5ad..00000000000
73 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
74 +++ /dev/null
75 @@ -1,61 +0,0 @@
76 -# Copyright 1999-2020 Gentoo Authors
77 -# Distributed under the terms of the GNU General Public License v2
78 -
79 -EAPI=7
80 -
81 -CMAKE_ECLASS=cmake
82 -
83 -inherit cmake-multilib flag-o-matic llvm
84 -
85 -DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
86 -HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
87 -SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
88 -
89 -LICENSE="MIT"
90 -SLOT="0"
91 -KEYWORDS="amd64"
92 -IUSE="debug"
93 -
94 -LLVM_MAX_SLOT=10
95 -
96 -COMMON="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
97 - <=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]"
98 -DEPEND="${COMMON}"
99 -RDEPEND="${COMMON}"
100 -
101 -PATCHES=(
102 - "${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
103 - "${FILESDIR}"/${PN}-1.0.4111-opencl-clang_version.patch
104 -)
105 -
106 -S="${WORKDIR}"/${PN}-igc-${PV}
107 -
108 -pkg_pretend() {
109 - if [[ ${MERGE_TYPE} != binary ]]; then
110 - if tc-is-clang && [[ $(clang-major-version) -ge 10 ]] ; then
111 - die "Building IGC with clang-10 and newer is presently not supported (see Bug #738934). Please use clang-9 or gcc instead."
112 - fi
113 - fi
114 -}
115 -
116 -multilib_src_configure() {
117 - # Select the same slot as the best opencl-clang
118 - local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)"
119 - einfo "Selecting $ocl_clang_ver"
120 - local llvm_slot=$(ver_cut 5 $ocl_clang_ver)
121 - # opencl-clang brings the right slot as dep
122 - has_version -d sys-devel/llvm:$llvm_slot || die "LLVM slot matching $ocl_clang_ver not found ($llvm_slot)"
123 - einfo "Selecting LLVM SLOT $llvm_slot: $(best_version -d sys-devel/llvm:$llvm_slot)"
124 -
125 - # Since late March 2020 cmake.eclass does not set -DNDEBUG any more, and the way
126 - # IGC uses this definition causes problems for some users (see Bug #718824).
127 - use debug || append-cppflags -DNDEBUG
128 -
129 - local mycmakeargs=(
130 - -DCCLANG_SONAME_VERSION=${llvm_slot}
131 - -DCMAKE_LIBRARY_PATH=$(get_llvm_prefix ${llvm_slot})/$(get_libdir)
132 - -DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
133 - -DIGC_PREFERRED_LLVM_VERSION=${llvm_slot}
134 - )
135 - cmake_src_configure
136 -}
137
138 diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4944.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4944.ebuild
139 deleted file mode 100644
140 index 7651df693d6..00000000000
141 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4944.ebuild
142 +++ /dev/null
143 @@ -1,72 +0,0 @@
144 -# Copyright 1999-2020 Gentoo Authors
145 -# Distributed under the terms of the GNU General Public License v2
146 -
147 -EAPI=7
148 -
149 -CMAKE_ECLASS=cmake
150 -
151 -inherit cmake-multilib flag-o-matic llvm
152 -
153 -DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
154 -HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
155 -SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
156 -
157 -LICENSE="MIT"
158 -SLOT="0"
159 -KEYWORDS="~amd64"
160 -IUSE="debug"
161 -
162 -LLVM_MAX_SLOT=10
163 -
164 -# Yes, the last dependency does effectively force the use of llvm-10
165 -# - there are currently no SLOT=9 ebuilds of opencl-clang with mem2reg
166 -# support. Of course with there being no SLOT=9 ebuilds of vc-intrinsics
167 -# (which we'll need soon as well) at all either we are limited to llvm-10 anyway.
168 -COMMON="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
169 - <=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
170 - >=dev-libs/opencl-clang-10.0.0.2:=[${MULTILIB_USEDEP}]"
171 -DEPEND="${COMMON}"
172 -RDEPEND="${COMMON}"
173 -
174 -PATCHES=(
175 - "${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
176 - "${FILESDIR}"/${PN}-1.0.4111-opencl-clang_version.patch
177 -)
178 -# "${FILESDIR}"/${PN}-1.0.4427-noVC_TranslateBuild_retval.patch
179 -
180 -S="${WORKDIR}"/${PN}-igc-${PV}
181 -
182 -find_best_llvm_slot() {
183 - local candidate_slot
184 -
185 - # Select the same slot as the best opencl-clang
186 - local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)"
187 - einfo "Selecting ${ocl_clang_ver}"
188 - candidate_slot=$(ver_cut 5 ${ocl_clang_ver})
189 -
190 - # Sanity check - opencl-clang brings the right LLVM slot as its
191 - # dependency so if this is missing, something is very wrong.
192 - has_version -d sys-devel/llvm:${candidate_slot} || die "LLVM slot matching ${ocl_clang_ver} not found (${candidate_slot})"
193 -
194 - echo ${candidate_slot}
195 -}
196 -
197 -multilib_src_configure() {
198 - local llvm_slot=$(find_best_llvm_slot)
199 - einfo "Selecting LLVM slot ${llvm_slot}: $(best_version -d sys-devel/llvm:${llvm_slot})"
200 - local llvm_prefix=$(get_llvm_prefix ${llvm_slot})
201 -
202 - # Since late March 2020 cmake.eclass does not set -DNDEBUG any more, and the way
203 - # IGC uses this definition causes problems for some users (see Bug #718824).
204 - use debug || append-cppflags -DNDEBUG
205 -
206 - # VectorCompiler needs work, at the moment upstream only supports building vc-intrinsics in place.
207 - local mycmakeargs=(
208 - -DCCLANG_SONAME_VERSION=${llvm_slot}
209 - -DCMAKE_LIBRARY_PATH="${llvm_prefix}"/$(get_libdir)
210 - -DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
211 - -DIGC_PREFERRED_LLVM_VERSION=${llvm_slot}
212 - -DIGC_BUILD__VC_ENABLED=no
213 - )
214 - cmake_src_configure
215 -}
216
217 diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.5353.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.5353.ebuild
218 deleted file mode 100644
219 index 0173f758337..00000000000
220 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.5353.ebuild
221 +++ /dev/null
222 @@ -1,73 +0,0 @@
223 -# Copyright 1999-2021 Gentoo Authors
224 -# Distributed under the terms of the GNU General Public License v2
225 -
226 -EAPI=7
227 -
228 -CMAKE_ECLASS=cmake
229 -
230 -inherit cmake-multilib flag-o-matic llvm
231 -
232 -DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
233 -HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
234 -SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
235 -
236 -LICENSE="MIT"
237 -SLOT="0"
238 -KEYWORDS="~amd64"
239 -IUSE="debug"
240 -
241 -LLVM_MAX_SLOT=11
242 -
243 -# Yes, the last dependency does effectively force the use of llvm-10
244 -# - there are currently no SLOT=9 ebuilds of opencl-clang with mem2reg
245 -# support. Of course with there being no SLOT=9 ebuilds of vc-intrinsics
246 -# (which we'll need soon as well) at all either we are limited to llvm-10 anyway.
247 -DEPEND="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
248 - <=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
249 - >=dev-libs/opencl-clang-11.0.0:=[${MULTILIB_USEDEP}]"
250 -RDEPEND="${DEPEND}"
251 -
252 -PATCHES=(
253 - "${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
254 - "${FILESDIR}"/${PN}-1.0.4111-opencl-clang_version.patch
255 -)
256 -# "${FILESDIR}"/${PN}-1.0.4427-noVC_TranslateBuild_retval.patch
257 -
258 -S="${WORKDIR}"/${PN}-igc-${PV}
259 -
260 -find_best_llvm_slot() {
261 - local candidate_slot
262 -
263 - # Select the same slot as the best opencl-clang
264 - local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)"
265 - einfo "Selecting ${ocl_clang_ver}"
266 - candidate_slot=$(ver_cut 5 ${ocl_clang_ver})
267 -
268 - # Sanity check - opencl-clang brings the right LLVM slot as its
269 - # dependency so if this is missing, something is very wrong.
270 - has_version -d sys-devel/llvm:${candidate_slot} || die "LLVM slot matching ${ocl_clang_ver} not found (${candidate_slot})"
271 -
272 - echo ${candidate_slot}
273 -}
274 -
275 -multilib_src_configure() {
276 - local llvm_slot=$(find_best_llvm_slot)
277 - einfo "Selecting LLVM slot ${llvm_slot}: $(best_version -d sys-devel/llvm:${llvm_slot})"
278 - local llvm_prefix=$(get_llvm_prefix ${llvm_slot})
279 - local llvm_ver=$(best_version -d sys-devel/llvm:${llvm_slot})
280 - llvm_ver=${llvm_ver##*-}
281 -
282 - # Since late March 2020 cmake.eclass does not set -DNDEBUG any more, and the way
283 - # IGC uses this definition causes problems for some users (see Bug #718824).
284 - use debug || append-cppflags -DNDEBUG
285 -
286 - # VectorCompiler needs work, at the moment upstream only supports building vc-intrinsics in place.
287 - local mycmakeargs=(
288 - -DCCLANG_SONAME_VERSION=${llvm_slot}
289 - -DCMAKE_LIBRARY_PATH="${llvm_prefix}"/$(get_libdir)
290 - -DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
291 - -DIGC_PREFERRED_LLVM_VERSION=${llvm_ver}
292 - -DIGC_BUILD__VC_ENABLED=no
293 - )
294 - cmake_src_configure
295 -}
296
297 diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8173.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8173.ebuild
298 deleted file mode 100644
299 index dd493717301..00000000000
300 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8173.ebuild
301 +++ /dev/null
302 @@ -1,74 +0,0 @@
303 -# Copyright 1999-2021 Gentoo Authors
304 -# Distributed under the terms of the GNU General Public License v2
305 -
306 -EAPI=7
307 -
308 -CMAKE_ECLASS=cmake
309 -PYTHON_COMPAT=( python{3_9,3_10} )
310 -LLVM_MAX_SLOT=10
311 -
312 -inherit cmake flag-o-matic llvm python-any-r1
313 -
314 -DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
315 -HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
316 -SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
317 -S="${WORKDIR}"/${PN}-igc-${PV}
318 -
319 -LICENSE="MIT"
320 -SLOT="0"
321 -KEYWORDS="~amd64"
322 -IUSE="debug"
323 -
324 -BDEPEND="${PYTHON_DEPS}
325 - >=sys-devel/lld-${LLVM_MAX_SLOT}"
326 -# Yes, the last dependency does effectively force the use of llvm-10
327 -# - there are currently no SLOT=9 ebuilds of opencl-clang with mem2reg
328 -# support. Of course with there being no SLOT=9 ebuilds of vc-intrinsics
329 -# (which we'll need soon as well) at all either we are limited to llvm-10 anyway.
330 -DEPEND="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=
331 - <=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=
332 - >=dev-libs/opencl-clang-12.0.0:="
333 -RDEPEND="${DEPEND}"
334 -
335 -PATCHES=(
336 - "${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
337 - "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
338 - "${FILESDIR}/${PN}-1.0.8173-fix-missing-limits.patch"
339 -)
340 -
341 -find_best_llvm_slot() {
342 - local candidate_slot
343 -
344 - # Select the same slot as the best opencl-clang
345 - local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)"
346 - einfo "Selecting ${ocl_clang_ver}"
347 - candidate_slot=$(ver_cut 5 ${ocl_clang_ver})
348 -
349 - # Sanity check - opencl-clang brings the right LLVM slot as its
350 - # dependency so if this is missing, something is very wrong.
351 - has_version -d sys-devel/llvm:${candidate_slot} || die "LLVM slot matching ${ocl_clang_ver} not found (${candidate_slot})"
352 -
353 - echo ${candidate_slot}
354 -}
355 -
356 -src_configure() {
357 - local llvm_slot=$(find_best_llvm_slot)
358 - einfo "Selecting LLVM slot ${llvm_slot}: $(best_version -d sys-devel/llvm:${llvm_slot})"
359 - local llvm_prefix=$(get_llvm_prefix ${llvm_slot})
360 - local llvm_ver=$(best_version -d sys-devel/llvm:${llvm_slot})
361 - llvm_ver=${llvm_ver##*-}
362 -
363 - # Since late March 2020 cmake.eclass does not set -DNDEBUG any more, and the way
364 - # IGC uses this definition causes problems for some users (see Bug #718824).
365 - use debug || append-cppflags -DNDEBUG
366 -
367 - # VectorCompiler needs work, at the moment upstream only supports building vc-intrinsics in place.
368 - local mycmakeargs=(
369 - -DCCLANG_SONAME_VERSION=${llvm_slot}
370 - -DCMAKE_LIBRARY_PATH="${llvm_prefix}"/$(get_libdir)
371 - -DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
372 - -DIGC_PREFERRED_LLVM_VERSION=${llvm_ver}
373 - -DIGC_BUILD__VC_ENABLED=no
374 - )
375 - cmake_src_configure
376 -}
377
378 diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365.ebuild
379 deleted file mode 100644
380 index b504e2949b3..00000000000
381 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365.ebuild
382 +++ /dev/null
383 @@ -1,81 +0,0 @@
384 -# Copyright 1999-2021 Gentoo Authors
385 -# Distributed under the terms of the GNU General Public License v2
386 -
387 -EAPI=7
388 -
389 -CMAKE_ECLASS=cmake
390 -PYTHON_COMPAT=( python{3_9,3_10} )
391 -LLVM_MAX_SLOT=10
392 -
393 -inherit cmake flag-o-matic llvm python-any-r1
394 -
395 -DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
396 -HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
397 -SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
398 -S="${WORKDIR}"/${PN}-igc-${PV}
399 -
400 -LICENSE="MIT"
401 -SLOT="0"
402 -KEYWORDS="~amd64"
403 -IUSE="debug"
404 -
405 -BDEPEND="
406 - ${PYTHON_DEPS}
407 - >=sys-devel/lld-${LLVM_MAX_SLOT}
408 -"
409 -
410 -# Yes, the last dependency does effectively force the use of llvm-10
411 -# - there are currently no SLOT=9 ebuilds of opencl-clang with mem2reg
412 -# support. Of course with there being no SLOT=9 ebuilds of vc-intrinsics
413 -# (which we'll need soon as well) at all either we are limited to llvm-10 anyway.
414 -DEPEND="
415 - <=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=
416 - <=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=
417 - >=dev-libs/opencl-clang-12.0.0:=
418 -"
419 -
420 -RDEPEND="${DEPEND}"
421 -
422 -PATCHES=(
423 - "${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
424 - "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
425 - "${FILESDIR}/${PN}-1.0.8173-fix-missing-limits.patch"
426 -)
427 -
428 -find_best_llvm_slot() {
429 - local candidate_slot
430 -
431 - # Select the same slot as the best opencl-clang
432 - local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)"
433 - einfo "Selecting ${ocl_clang_ver}"
434 - candidate_slot=$(ver_cut 5 ${ocl_clang_ver})
435 -
436 - # Sanity check - opencl-clang brings the right LLVM slot as its
437 - # dependency so if this is missing, something is very wrong.
438 - has_version -d sys-devel/llvm:${candidate_slot} || die "LLVM slot matching ${ocl_clang_ver} not found (${candidate_slot})"
439 -
440 - echo ${candidate_slot}
441 -}
442 -
443 -src_configure() {
444 - local llvm_slot=$(find_best_llvm_slot)
445 - einfo "Selecting LLVM slot ${llvm_slot}: $(best_version -d sys-devel/llvm:${llvm_slot})"
446 - local llvm_prefix=$(get_llvm_prefix ${llvm_slot})
447 - local llvm_ver=$(best_version -d sys-devel/llvm:${llvm_slot})
448 - llvm_ver=${llvm_ver##*-}
449 -
450 - # Since late March 2020 cmake.eclass does not set -DNDEBUG any more, and the way
451 - # IGC uses this definition causes problems for some users (see Bug #718824).
452 - use debug || append-cppflags -DNDEBUG
453 -
454 - # VectorCompiler needs work, at the moment upstream only supports building vc-intrinsics in place.
455 - local mycmakeargs=(
456 - -DCCLANG_SONAME_VERSION=${llvm_slot}
457 - -DCMAKE_LIBRARY_PATH="${llvm_prefix}"/$(get_libdir)
458 - -DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
459 - -DIGC_PREFERRED_LLVM_VERSION=${llvm_ver}
460 - -DIGC_BUILD__VC_ENABLED=no
461 - )
462 -
463 - cmake_src_configure
464 -}
465
466 diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8517.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8517.ebuild
467 deleted file mode 100644
468 index fff9a377a38..00000000000
469 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8517.ebuild
470 +++ /dev/null
471 @@ -1,79 +0,0 @@
472 -# Copyright 1999-2021 Gentoo Authors
473 -# Distributed under the terms of the GNU General Public License v2
474 -
475 -EAPI=7
476 -
477 -CMAKE_BUILD_TYPE="Release"
478 -LLVM_MAX_SLOT="10"
479 -MY_PN="igc"
480 -MY_P="${MY_PN}-${PV}"
481 -PYTHON_COMPAT=( python3_{8..10} )
482 -
483 -inherit cmake flag-o-matic llvm python-any-r1
484 -
485 -DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
486 -HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
487 -SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
488 -S="${WORKDIR}/${PN}-${MY_P}"
489 -
490 -LICENSE="MIT"
491 -SLOT="0"
492 -KEYWORDS="~amd64"
493 -IUSE="debug"
494 -
495 -DEPEND="
496 - dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
497 - sys-devel/llvm:${LLVM_MAX_SLOT}=
498 -"
499 -
500 -RDEPEND="${DEPEND}"
501 -
502 -BDEPEND="
503 - ${PYTHON_DEPS}
504 - >=sys-devel/lld-${LLVM_MAX_SLOT}
505 -"
506 -
507 -PATCHES=(
508 - "${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
509 - "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
510 - "${FILESDIR}/${PN}-1.0.8173-fix-missing-limits.patch"
511 - "${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
512 - "${FILESDIR}/${PN}-1.0.8365-cmake-project.patch"
513 - "${FILESDIR}/${PN}-1.0.8365-cmake-minimum-version.patch"
514 - "${FILESDIR}/${PN}-1.0.8517-fix-missing-limits.patch"
515 -)
516 -
517 -pkg_setup() {
518 - llvm_pkg_setup
519 - python-any-r1_pkg_setup
520 -}
521 -
522 -src_configure() {
523 - # Since late March 2020 cmake.eclass does not set -DNDEBUG any more,
524 - # and the way IGC uses this definition causes problems for some users.
525 - # See bug #718824 for more information.
526 - ! use debug && append-cppflags -DNDEBUG
527 -
528 - local mycmakeargs=(
529 - # Those options are ensuring, that we are using
530 - # the system LLVM with the correct slot.
531 - -DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
532 - -DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
533 - -DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
534 - -DIGC_OPTION__CLANG_MODE="Prebuilds"
535 - -DIGC_OPTION__LLD_MODE="Prebuilds"
536 - -DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
537 - -DIGC_OPTION__LLVM_MODE="Prebuilds"
538 - -DIGC_OPTION__LLVM_PREFERRED_VERSION="${LLVM_MAX_SLOT}"
539 -
540 - # VectorCompiler needs work, as at the moment upstream
541 - # only supports building vc-intrinsics in place.
542 - -DIGC_BUILD__VC_ENABLED="NO"
543 -
544 - # This will suspress some CMake warnings,
545 - # which cannot be fixed at the moment.
546 - -Wno-dev
547 - )
548 -
549 - cmake_src_configure
550 -}