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/rocr-runtime/, dev-libs/rocr-runtime/files/
Date: Tue, 25 Aug 2020 21:08:19
Message-Id: 1598389685.7826f372ef2ea40a659ac53593aacb3523acc60f.candrews@gentoo
1 commit: 7826f372ef2ea40a659ac53593aacb3523acc60f
2 Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 25 21:01:41 2020 +0000
4 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 25 21:08:05 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7826f372
7
8 dev-libs/rocr-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/rocr-runtime/Manifest | 4 --
14 .../rocr-runtime-3.0.0-cmake-install-paths.patch | 45 ----------------------
15 .../rocr-runtime-3.5.0-cmake-install-paths.patch | 35 -----------------
16 dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild | 37 ------------------
17 dev-libs/rocr-runtime/rocr-runtime-3.1.0.ebuild | 37 ------------------
18 dev-libs/rocr-runtime/rocr-runtime-3.3.0.ebuild | 37 ------------------
19 dev-libs/rocr-runtime/rocr-runtime-3.5.0.ebuild | 37 ------------------
20 7 files changed, 232 deletions(-)
21
22 diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
23 index d0f1a066964..14ae92168b7 100644
24 --- a/dev-libs/rocr-runtime/Manifest
25 +++ b/dev-libs/rocr-runtime/Manifest
26 @@ -1,5 +1 @@
27 -DIST rocr-runtime-3.0.0.tar.gz 327908 BLAKE2B 0d95ecc22d27e470dd46f02aca012c59e8d0b0bd76de21133a1198d2daa75547600d95ea6c3a3771da36ce3fdf5e197b40ff68543b71adf36d33079a9d9496ab SHA512 e1a1eeec67bca02defc6f502e94dab71e48833737cc0f45552781c5b0cc36bff9147b2c477d6c2c3c9bd25654569ad1d91cd06aa81fcf412657a489cb56c5674
28 -DIST rocr-runtime-3.1.0.tar.gz 329176 BLAKE2B 845dcfc5a00e6d571bfef6330b370f588496de95ee7e04caf9c29f81e389f3e82dcdace11d48c86b01119cc0e73bf0a50949da9c4f5383044360f59176670d95 SHA512 a9b540341c649786aa0b53755fc51f540425d67c5a567834abbef9bb55c9b0120b1f14c082bfbc97f3c2a586aa846853f293093116aa8625dc34cae6fe50683a
29 -DIST rocr-runtime-3.3.0.tar.gz 329386 BLAKE2B 59eb0838d377bb8b10887d7fb432e634190196516fff30a9401b591f2bb7846938c5486bac921fb4fce905a3acfbf4dd064ed9b53122da847fd5fb3d3d2f701c SHA512 ec7950aacd84c318978b9abbad0aafcae1e2d7d7c77806432bde0ce861372e6db92d74ba6445d3ac92c835aa0137b1929d27ddee77b9dae92ca2465a70c4878d
30 -DIST rocr-runtime-3.5.0.tar.gz 336269 BLAKE2B afde0f9fcfad389a56f31352036174b8b2a5e9960f5bbcff8a7ca9dc54e4b68d92b70afa70af5aa43d040749bccd2df957df89fea1036890abdaf7e6a5c3b620 SHA512 20d95b13dccf2fe5b8da5859661a21279f18d1c45899782c55477265500057708360ce2049a8e9b3aadbcb33f8e4274459edb17a8455dc3db69ccf31b86a581e
31 DIST rocr-runtime-3.7.0.tar.gz 691234 BLAKE2B b0f3b1ff6c13c132d00bbf30d405746e793aae377aca2279117c7b9dd6fdc1d466ef2076947061c848913378a20ee0dc7e32847c62a7416e4088ab0705d17dfd SHA512 f7fa77524d7f63980194e93a8e3124f1471dcdfec6ede5eb993699083e5d8fba28737fcc63dbd61949e3ce60e9fbd1455ec055a0aa5c7eee724ae6bb61d3b24f
32
33 diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-3.0.0-cmake-install-paths.patch b/dev-libs/rocr-runtime/files/rocr-runtime-3.0.0-cmake-install-paths.patch
34 deleted file mode 100644
35 index 29429d0c480..00000000000
36 --- a/dev-libs/rocr-runtime/files/rocr-runtime-3.0.0-cmake-install-paths.patch
37 +++ /dev/null
38 @@ -1,45 +0,0 @@
39 -https://github.com/RadeonOpenCompute/ROCR-Runtime/pull/51
40 -
41 -From 09a835e8de2d88e917328a78765a1db423d21920 Mon Sep 17 00:00:00 2001
42 -From: Craig Andrews <candrews@××××××××××××.com>
43 -Date: Sun, 29 Dec 2019 16:57:00 -0500
44 -Subject: [PATCH] Correctly install the library into the system
45 -
46 -Install to standard locations in /usr/{lib,include}/lib (as opposed to /usr/hsa/{lib,include}/hsa)
47 -Use CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR from GNUInstallDirs instead of using "lib" and "include"
48 ----
49 - CMakeLists.txt | 13 +++----------
50 - 1 file changed, 3 insertions(+), 10 deletions(-)
51 -
52 -diff --git a/CMakeLists.txt b/CMakeLists.txt
53 -index f292182..7474dd2 100644
54 ---- a/CMakeLists.txt
55 -+++ b/CMakeLists.txt
56 -@@ -61,6 +61,7 @@ endif() # if (ROCM_CCACHE_BUILD)
57 -
58 - list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" )
59 - include ( utils )
60 -+include ( GNUInstallDirs )
61 - include ( hsa_common )
62 -
63 - ## Find LibElf
64 -@@ -176,17 +177,9 @@ endif ()
65 - set_property ( TARGET ${CORE_RUNTIME_TARGET} PROPERTY VERSION "${SO_VERSION_STRING}" )
66 - set_property ( TARGET ${CORE_RUNTIME_TARGET} PROPERTY SOVERSION "${SO_MAJOR}" )
67 -
68 --## Create symlinks for legacy packaging and install
69 --add_custom_target ( hsa_include_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/include/hsa hsa_include_link )
70 --add_custom_target ( hsa_lib_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}-link.so )
71 --add_custom_target ( hsa_lib_link2 ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${CORE_RUNTIME_LIBRARY}.so.${SO_MAJOR} ${CORE_RUNTIME_LIBRARY}-link.so.${SO_MAJOR} )
72 --
73 - ## Set install information
74 --install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION hsa/lib )
75 --install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION hsa/include/hsa )
76 --install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa )
77 --install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so )
78 --install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so.${SO_MAJOR} DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so.${SO_MAJOR} )
79 -+install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
80 -+install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa )
81 -
82 - ## Packaging directives
83 - set ( CPACK_GENERATOR "DEB;RPM" CACHE STRING "Package types to build")
84
85 diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-3.5.0-cmake-install-paths.patch b/dev-libs/rocr-runtime/files/rocr-runtime-3.5.0-cmake-install-paths.patch
86 deleted file mode 100644
87 index a98a5f450f0..00000000000
88 --- a/dev-libs/rocr-runtime/files/rocr-runtime-3.5.0-cmake-install-paths.patch
89 +++ /dev/null
90 @@ -1,35 +0,0 @@
91 ---- a/CMakeLists.txt 2020-06-06 18:15:44.473493765 +0200
92 -+++ b/CMakeLists.txt 2020-06-06 18:25:47.688491464 +0200
93 -@@ -66,6 +66,7 @@
94 -
95 - list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" )
96 - include ( utils )
97 -+include ( GNUInstallDirs )
98 - include ( hsa_common )
99 -
100 - ## Find LibElf
101 -@@ -185,22 +186,9 @@
102 - set_property ( TARGET ${CORE_RUNTIME_TARGET} PROPERTY VERSION "${SO_VERSION_STRING}" )
103 - set_property ( TARGET ${CORE_RUNTIME_TARGET} PROPERTY SOVERSION "${SO_MAJOR}" )
104 -
105 --## Create symlinks for legacy packaging and install
106 --add_custom_target ( hsa_include_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/include/hsa hsa_include_link )
107 --if ( ${BUILD_SHARED_LIBS} )
108 -- add_custom_target ( hsa_lib_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}-link.so )
109 -- add_custom_target ( hsa_lib_link2 ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${CORE_RUNTIME_LIBRARY}.so.${SO_MAJOR} ${CORE_RUNTIME_LIBRARY}-link.so.${SO_MAJOR} )
110 --endif()
111 --
112 - ## Set install information
113 --install ( TARGETS ${CORE_RUNTIME_TARGET} DESTINATION hsa/lib COMPONENT binary)
114 --install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION hsa/include/hsa COMPONENT binary)
115 --install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa COMPONENT dirlink)
116 --
117 --if ( ${BUILD_SHARED_LIBS} )
118 -- install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so COMPONENT binary)
119 -- install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so.${SO_MAJOR} DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so.${SO_MAJOR} COMPONENT binary)
120 --endif ()
121 -+install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
122 -+install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa )
123 -
124 - ## Packaging directives
125 - set ( CPACK_GENERATOR "DEB;RPM" CACHE STRING "Package types to build")
126
127 diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild
128 deleted file mode 100644
129 index d6ba469a09f..00000000000
130 --- a/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild
131 +++ /dev/null
132 @@ -1,37 +0,0 @@
133 -# Copyright 1999-2020 Gentoo Authors
134 -# Distributed under the terms of the GNU General Public License v2
135 -
136 -EAPI=7
137 -
138 -inherit cmake
139 -
140 -if [[ ${PV} == *9999 ]] ; then
141 - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
142 - inherit git-r3
143 - S="${WORKDIR}/${P}/src"
144 -else
145 - SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
146 - S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
147 - KEYWORDS="~amd64"
148 -fi
149 -
150 -DESCRIPTION="Radeon Open Compute Runtime"
151 -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
152 -PATCHES=(
153 - "${FILESDIR}/${PN}-3.0.0-cmake-install-paths.patch"
154 -)
155 -
156 -LICENSE="MIT"
157 -SLOT="0/$(ver_cut 1-2)"
158 -IUSE="non-free"
159 -
160 -COMMON_DEPEND="sys-process/numactl"
161 -RDEPEND="${COMMON_DEPEND}
162 - non-free? ( dev-libs/hsa-ext-rocr )"
163 -DEPEND="${COMMON_DEPEND}
164 - >=dev-libs/roct-thunk-interface-${PV}"
165 -
166 -src_prepare() {
167 - sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
168 - cmake_src_prepare
169 -}
170
171 diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.1.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.1.0.ebuild
172 deleted file mode 100644
173 index d6ba469a09f..00000000000
174 --- a/dev-libs/rocr-runtime/rocr-runtime-3.1.0.ebuild
175 +++ /dev/null
176 @@ -1,37 +0,0 @@
177 -# Copyright 1999-2020 Gentoo Authors
178 -# Distributed under the terms of the GNU General Public License v2
179 -
180 -EAPI=7
181 -
182 -inherit cmake
183 -
184 -if [[ ${PV} == *9999 ]] ; then
185 - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
186 - inherit git-r3
187 - S="${WORKDIR}/${P}/src"
188 -else
189 - SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
190 - S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
191 - KEYWORDS="~amd64"
192 -fi
193 -
194 -DESCRIPTION="Radeon Open Compute Runtime"
195 -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
196 -PATCHES=(
197 - "${FILESDIR}/${PN}-3.0.0-cmake-install-paths.patch"
198 -)
199 -
200 -LICENSE="MIT"
201 -SLOT="0/$(ver_cut 1-2)"
202 -IUSE="non-free"
203 -
204 -COMMON_DEPEND="sys-process/numactl"
205 -RDEPEND="${COMMON_DEPEND}
206 - non-free? ( dev-libs/hsa-ext-rocr )"
207 -DEPEND="${COMMON_DEPEND}
208 - >=dev-libs/roct-thunk-interface-${PV}"
209 -
210 -src_prepare() {
211 - sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
212 - cmake_src_prepare
213 -}
214
215 diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.3.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.3.0.ebuild
216 deleted file mode 100644
217 index 27a97d1c760..00000000000
218 --- a/dev-libs/rocr-runtime/rocr-runtime-3.3.0.ebuild
219 +++ /dev/null
220 @@ -1,37 +0,0 @@
221 -# Copyright 1999-2020 Gentoo Authors
222 -# Distributed under the terms of the GNU General Public License v2
223 -
224 -EAPI=7
225 -
226 -inherit cmake
227 -
228 -if [[ ${PV} == *9999 ]] ; then
229 - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
230 - inherit git-r3
231 - S="${WORKDIR}/${P}/src"
232 -else
233 - SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
234 - S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/src"
235 - KEYWORDS="~amd64"
236 -fi
237 -
238 -DESCRIPTION="Radeon Open Compute Runtime"
239 -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
240 -PATCHES=(
241 - "${FILESDIR}/${PN}-3.0.0-cmake-install-paths.patch"
242 -)
243 -
244 -LICENSE="MIT"
245 -SLOT="0/$(ver_cut 1-2)"
246 -IUSE="non-free"
247 -
248 -COMMON_DEPEND="sys-process/numactl"
249 -RDEPEND="${COMMON_DEPEND}
250 - non-free? ( dev-libs/hsa-ext-rocr )"
251 -DEPEND="${COMMON_DEPEND}
252 - >=dev-libs/roct-thunk-interface-${PV}"
253 -
254 -src_prepare() {
255 - sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
256 - cmake_src_prepare
257 -}
258
259 diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.5.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.5.0.ebuild
260 deleted file mode 100644
261 index 5d787962fa1..00000000000
262 --- a/dev-libs/rocr-runtime/rocr-runtime-3.5.0.ebuild
263 +++ /dev/null
264 @@ -1,37 +0,0 @@
265 -# Copyright 1999-2020 Gentoo Authors
266 -# Distributed under the terms of the GNU General Public License v2
267 -
268 -EAPI=7
269 -
270 -inherit cmake
271 -
272 -if [[ ${PV} == *9999 ]] ; then
273 - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
274 - inherit git-r3
275 - S="${WORKDIR}/${P}/src"
276 -else
277 - SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
278 - S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/src"
279 - KEYWORDS="~amd64"
280 -fi
281 -
282 -DESCRIPTION="Radeon Open Compute Runtime"
283 -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
284 -PATCHES=(
285 - "${FILESDIR}/${PN}-3.5.0-cmake-install-paths.patch"
286 -)
287 -
288 -LICENSE="MIT"
289 -SLOT="0/$(ver_cut 1-2)"
290 -IUSE="non-free"
291 -
292 -COMMON_DEPEND="sys-process/numactl"
293 -RDEPEND="${COMMON_DEPEND}
294 - non-free? ( dev-libs/hsa-ext-rocr )"
295 -DEPEND="${COMMON_DEPEND}
296 - >=dev-libs/roct-thunk-interface-${PV}"
297 -
298 -src_prepare() {
299 - sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
300 - cmake_src_prepare
301 -}