Gentoo Archives: gentoo-commits

From: Craig Andrews <candrews@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocm-opencl-runtime/
Date: Tue, 25 Aug 2020 21:08:19
Message-Id: 1598389684.1e6a2c4735a177ed7d1109f9f4b20cfa30e232c9.candrews@gentoo
1 commit: 1e6a2c4735a177ed7d1109f9f4b20cfa30e232c9
2 Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 25 20:59:09 2020 +0000
4 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 25 21:08:04 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e6a2c47
7
8 dev-libs/rocm-opencl-runtime: Cleanup old versions
9
10 Package-Manager: Portage-3.0.4, Repoman-3.0.1
11 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
12
13 dev-libs/rocm-opencl-runtime/Manifest | 5 --
14 .../rocm-opencl-runtime-3.0.0.ebuild | 57 ------------------
15 .../rocm-opencl-runtime-3.1.0.ebuild | 56 ------------------
16 .../rocm-opencl-runtime-3.3.0.ebuild | 56 ------------------
17 .../rocm-opencl-runtime-3.5.0-r1.ebuild | 68 ----------------------
18 5 files changed, 242 deletions(-)
19
20 diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
21 index 3f9bc8f9f6f..cd20ea75e84 100644
22 --- a/dev-libs/rocm-opencl-runtime/Manifest
23 +++ b/dev-libs/rocm-opencl-runtime/Manifest
24 @@ -1,6 +1 @@
25 -DIST OpenCL-ICD-Loader-6c03f8b58fafd9dd693eaac826749a5cfad515f8.tar.gz 63248 BLAKE2B 7c311d98e5a209d01f1f1dbad7471ceb3de66e10f7cee48686ed176efcde1e7ba48ea12bdbf2af61d5f72e5b8eda69b2fae6829d265a8b88ad46c4ec4995d8d4 SHA512 5033d6fb0ef2515e56b0d9c31baf6fe02e90613989c417fbde20efd79e0ac2841df1a98ff799e60cc469b79244cdc756d15950df6c9baead7d31febe7cad0418
26 -DIST rocm-opencl-runtime-3.0.0.tar.gz 974702 BLAKE2B 2cc1eaf1aa8d8cc80de698b587bf38cfebd51b31959b9d0150e4f01ea1b41240b0311cad156c48cf531207f1a120d2151f38679a8bc4cef1e73c9c8e56dcaf45 SHA512 2a47deda34544832421fd8110dd437eaeab3a1fca498a9ac14e825402d48e81fb9fe065d078bc8bf112e0534a750fdf81a29bf5979b42f9925b1561f7bcbf6e7
27 -DIST rocm-opencl-runtime-3.1.0.tar.gz 969782 BLAKE2B efe3cba6122273900fec80f577c45b5a93816cfd3cadbffaa36df258ea163ecc9d47530da0aa012fd7797c431506deb96fd3642c160470e2b78af75bc9fd56f6 SHA512 1665c30349547e6404563b1b1dd4258af5ab8106a66d65d6f94e7eb3ef51b2da9bc71878330c0c7ec21842e17a97e910a36be9b06fbdeab3de84bebe3a65c9db
28 -DIST rocm-opencl-runtime-3.3.0.tar.gz 969871 BLAKE2B 5dae88abc5861752b45f2b7e72a4d774786d0363a6da633d2ca1386a002374243a0655e8c5bc4aaa7a7db528f3c9bd5e6e1298561d3b06ce935865b6f0106172 SHA512 10c892cebca3db031b69ef3e1521fa11e49f40b18b621983f4f0902c9f563ff178d543fd1a05f6217f817838499436adaac883f7b474b64a54ce9eeb482382e5
29 -DIST rocm-opencl-runtime-3.5.0.tar.gz 734076 BLAKE2B cc6992999188968c628b378f637c8073c99381fab42e05d7d9d89d75fe9f2bd3d573f61f00a18c078542f7fc4a3a856385d0f34fa9bb599dd63de8be18594bdf SHA512 658649c3f13d32308f8f031f26b62c20bda4841059b5ea0db5c6a827af26b07aa0bdee07a461cc4b3c37108b3f25ae59b1658fab30125f84c0729fb57c2fa014
30 DIST rocm-opencl-runtime-3.7.0.tar.gz 1004361 BLAKE2B 7fa9481c77884dda15a3b0335449b2879fbac000f644fc56bbd8d06c5fd77d8355f159b9b7e8920f06351e388d0df41379b7e1fcff51cf81714a28f902218e42 SHA512 6ea509dde0290f13e66497eaad587099ed6a98df967adce207afc857ecd961b65801332ca74e36173719488639480cfcffc625a007345d0e48c10c8a0efdfa3f
31
32 diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild
33 deleted file mode 100644
34 index 390f4de5e07..00000000000
35 --- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild
36 +++ /dev/null
37 @@ -1,57 +0,0 @@
38 -# Copyright 1999-2020 Gentoo Authors
39 -# Distributed under the terms of the GNU General Public License v2
40 -
41 -EAPI=7
42 -
43 -inherit cmake
44 -
45 -OPENCL_ICD_COMMIT="6c03f8b58fafd9dd693eaac826749a5cfad515f8"
46 -SRC_URI="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${OPENCL_ICD_COMMIT}.tar.gz -> OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}.tar.gz"
47 -if [[ ${PV} == *9999 ]] ; then
48 - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
49 - inherit git-r3
50 -else
51 - SRC_URI+=" https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
52 - KEYWORDS="~amd64"
53 - S="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}"
54 -fi
55 -
56 -DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
57 -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
58 -
59 -LICENSE="Apache-2.0 MIT"
60 -SLOT="0/$(ver_cut 1-2)"
61 -
62 -RDEPEND=">=dev-libs/rocr-runtime-${PV}
63 - >=dev-libs/rocm-comgr-${PV}
64 - >=dev-libs/rocm-device-libs-${PV}
65 - >=virtual/opencl-3
66 - media-libs/mesa"
67 -DEPEND="${RDEPEND}
68 - dev-lang/ocaml
69 - dev-ml/findlib"
70 -BDEPEND=">=dev-util/rocm-cmake-${PV}"
71 -
72 -PATCHES=(
73 - "${FILESDIR}/${PN}-3.0.0-change-install-location.patch"
74 - "${FILESDIR}/${PN}-2.8.0-change-AMDCompilerh.patch"
75 - "${FILESDIR}/${PN}-2.8.0-change-opencl.patch"
76 - "${FILESDIR}/${PN}-2.8.0-update-README.patch"
77 - "${FILESDIR}/${PN}-2.8.0-amdocl64icd.patch"
78 -)
79 -
80 -src_prepare() {
81 - mkdir -p "${S}"/api/opencl/khronos/ || die
82 - mv "${WORKDIR}/OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}" "${S}"/api/opencl/khronos/icd || die
83 - [ -d tools/clinfo ] && rm -rf tools/clinfo || die
84 - cmake_src_prepare
85 -}
86 -
87 -src_configure() {
88 - local mycmakeargs=(
89 - -DUSE_COMGR_LIBRARY=yes
90 - -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
91 - -DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang/"
92 - )
93 - cmake_src_configure
94 -}
95
96 diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.1.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.1.0.ebuild
97 deleted file mode 100644
98 index 45a3fcd5324..00000000000
99 --- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.1.0.ebuild
100 +++ /dev/null
101 @@ -1,56 +0,0 @@
102 -# Copyright 1999-2020 Gentoo Authors
103 -# Distributed under the terms of the GNU General Public License v2
104 -
105 -EAPI=7
106 -
107 -inherit cmake
108 -
109 -OPENCL_ICD_COMMIT="6c03f8b58fafd9dd693eaac826749a5cfad515f8"
110 -SRC_URI="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${OPENCL_ICD_COMMIT}.tar.gz -> OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}.tar.gz"
111 -if [[ ${PV} == *9999 ]] ; then
112 - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
113 - inherit git-r3
114 -else
115 - SRC_URI+=" https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
116 - KEYWORDS="~amd64"
117 - S="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}"
118 -fi
119 -
120 -DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
121 -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
122 -
123 -LICENSE="Apache-2.0 MIT"
124 -SLOT="0/$(ver_cut 1-2)"
125 -
126 -RDEPEND=">=dev-libs/rocr-runtime-${PV}
127 - >=dev-libs/rocm-comgr-${PV}
128 - >=dev-libs/rocm-device-libs-${PV}
129 - >=virtual/opencl-3
130 - media-libs/mesa"
131 -DEPEND="${RDEPEND}
132 - dev-lang/ocaml
133 - dev-ml/findlib"
134 -BDEPEND=">=dev-util/rocm-cmake-3.0.0"
135 -
136 -PATCHES=(
137 - "${FILESDIR}/${PN}-3.0.0-change-install-location.patch"
138 - "${FILESDIR}/${PN}-2.8.0-change-opencl.patch"
139 - "${FILESDIR}/${PN}-2.8.0-update-README.patch"
140 - "${FILESDIR}/${PN}-2.8.0-amdocl64icd.patch"
141 -)
142 -
143 -src_prepare() {
144 - mkdir -p "${S}"/api/opencl/khronos/ || die
145 - mv "${WORKDIR}/OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}" "${S}"/api/opencl/khronos/icd || die
146 - [ -d tools/clinfo ] && rm -rf tools/clinfo || die
147 - cmake_src_prepare
148 -}
149 -
150 -src_configure() {
151 - local mycmakeargs=(
152 - -DUSE_COMGR_LIBRARY=yes
153 - -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
154 - -DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang/"
155 - )
156 - cmake_src_configure
157 -}
158
159 diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.3.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.3.0.ebuild
160 deleted file mode 100644
161 index 45a3fcd5324..00000000000
162 --- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.3.0.ebuild
163 +++ /dev/null
164 @@ -1,56 +0,0 @@
165 -# Copyright 1999-2020 Gentoo Authors
166 -# Distributed under the terms of the GNU General Public License v2
167 -
168 -EAPI=7
169 -
170 -inherit cmake
171 -
172 -OPENCL_ICD_COMMIT="6c03f8b58fafd9dd693eaac826749a5cfad515f8"
173 -SRC_URI="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${OPENCL_ICD_COMMIT}.tar.gz -> OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}.tar.gz"
174 -if [[ ${PV} == *9999 ]] ; then
175 - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
176 - inherit git-r3
177 -else
178 - SRC_URI+=" https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
179 - KEYWORDS="~amd64"
180 - S="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}"
181 -fi
182 -
183 -DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
184 -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
185 -
186 -LICENSE="Apache-2.0 MIT"
187 -SLOT="0/$(ver_cut 1-2)"
188 -
189 -RDEPEND=">=dev-libs/rocr-runtime-${PV}
190 - >=dev-libs/rocm-comgr-${PV}
191 - >=dev-libs/rocm-device-libs-${PV}
192 - >=virtual/opencl-3
193 - media-libs/mesa"
194 -DEPEND="${RDEPEND}
195 - dev-lang/ocaml
196 - dev-ml/findlib"
197 -BDEPEND=">=dev-util/rocm-cmake-3.0.0"
198 -
199 -PATCHES=(
200 - "${FILESDIR}/${PN}-3.0.0-change-install-location.patch"
201 - "${FILESDIR}/${PN}-2.8.0-change-opencl.patch"
202 - "${FILESDIR}/${PN}-2.8.0-update-README.patch"
203 - "${FILESDIR}/${PN}-2.8.0-amdocl64icd.patch"
204 -)
205 -
206 -src_prepare() {
207 - mkdir -p "${S}"/api/opencl/khronos/ || die
208 - mv "${WORKDIR}/OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}" "${S}"/api/opencl/khronos/icd || die
209 - [ -d tools/clinfo ] && rm -rf tools/clinfo || die
210 - cmake_src_prepare
211 -}
212 -
213 -src_configure() {
214 - local mycmakeargs=(
215 - -DUSE_COMGR_LIBRARY=yes
216 - -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
217 - -DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang/"
218 - )
219 - cmake_src_configure
220 -}
221
222 diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.5.0-r1.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.5.0-r1.ebuild
223 deleted file mode 100644
224 index 28188cb2bb6..00000000000
225 --- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.5.0-r1.ebuild
226 +++ /dev/null
227 @@ -1,68 +0,0 @@
228 -# Copyright 1999-2020 Gentoo Authors
229 -# Distributed under the terms of the GNU General Public License v2
230 -
231 -EAPI=7
232 -
233 -inherit cmake
234 -
235 -if [[ ${PV} == *9999 ]] ; then
236 - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
237 - inherit git-r3
238 -else
239 - SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
240 - KEYWORDS="~amd64"
241 - S="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}"
242 -fi
243 -
244 -DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
245 -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
246 -
247 -LICENSE="Apache-2.0 MIT"
248 -SLOT="0/$(ver_cut 1-2)"
249 -
250 -RDEPEND=">=dev-libs/rocr-runtime-${PV}
251 - >=dev-libs/rocclr-${PV}
252 - >=dev-libs/rocm-comgr-${PV}
253 - >=dev-libs/rocm-device-libs-${PV}
254 - >=virtual/opencl-3
255 - media-libs/mesa"
256 -DEPEND="${RDEPEND}
257 - dev-lang/ocaml
258 - dev-ml/findlib"
259 -BDEPEND=">=dev-util/rocm-cmake-${PV}"
260 -
261 -PATCHES=(
262 - "${FILESDIR}/${PN}-3.5.0-change-install-location.patch"
263 - "${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
264 - "${FILESDIR}/${PN}-3.5.0-amdocl64icd.patch"
265 -)
266 -
267 -src_prepare() {
268 - # Remove "clinfo" - use "dev-util/clinfo" instead
269 - [ -d tools/clinfo ] && rm -rf tools/clinfo || die
270 -
271 - # Wrong position of a '"' results in a list of strings instead of a single string and the build fails...
272 - sed -e "s:set(CMAKE_SHARED_LINKER_FLAGS \${CMAKE_SHARED_LINKER_FLAGS} \":set(CMAKE_SHARED_LINKER_FLAGS \"\${CMAKE_SHARED_LINKER_FLAGS} :" -i "${S}/amdocl/CMakeLists.txt"
273 -
274 - cmake_src_prepare
275 -}
276 -
277 -src_configure() {
278 - # Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
279 - append-cflags -fcommon
280 -
281 - local mycmakeargs=(
282 - -DUSE_COMGR_LIBRARY=yes
283 - -DROCclr_DIR="${EPREFIX}/usr/include/rocclr"
284 - -DLIBROCclr_STATIC_DIR="${EPREFIX}/usr/lib64/cmake/rocclr"
285 - )
286 - cmake_src_configure
287 -}
288 -
289 -src_install() {
290 - cd "${BUILD_DIR}" || die
291 - insinto /etc/OpenCL/vendors
292 - doins amdocl64.icd
293 - insinto /usr/lib64
294 - doins lib/libamdocl64.so
295 -}