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: Sat, 26 Sep 2020 15:43:53
Message-Id: 1601135024.2e6caa0ce80ac3b218092ccb9fc0bef9ef619309.candrews@gentoo
1 commit: 2e6caa0ce80ac3b218092ccb9fc0bef9ef619309
2 Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 26 15:42:07 2020 +0000
4 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 26 15:43:44 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e6caa0c
7
8 dev-libs/rocm-opencl-runtime: Cleanup old version
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.1
11 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
12
13 dev-libs/rocm-opencl-runtime/Manifest | 1 -
14 .../rocm-opencl-runtime-3.7.0.ebuild | 69 ----------------------
15 2 files changed, 70 deletions(-)
16
17 diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
18 index 92c4ca9c727..f211cc17aaa 100644
19 --- a/dev-libs/rocm-opencl-runtime/Manifest
20 +++ b/dev-libs/rocm-opencl-runtime/Manifest
21 @@ -1,2 +1 @@
22 -DIST rocm-opencl-runtime-3.7.0.tar.gz 1004361 BLAKE2B 7fa9481c77884dda15a3b0335449b2879fbac000f644fc56bbd8d06c5fd77d8355f159b9b7e8920f06351e388d0df41379b7e1fcff51cf81714a28f902218e42 SHA512 6ea509dde0290f13e66497eaad587099ed6a98df967adce207afc857ecd961b65801332ca74e36173719488639480cfcffc625a007345d0e48c10c8a0efdfa3f
23 DIST rocm-opencl-runtime-3.8.0.tar.gz 1004339 BLAKE2B 966a5bd1d4d188004b15fe4263f2c18f6dad6a07f4bc264a5afa010f6035fbf73288966cd624e6e31e1ba584ba322d93343e3482177e6480c4a57a4150546f5a SHA512 bb4e3568e32bf6acc3c4812d7db169396a01bf90d079dc420ffb7df4bd4146d39938e76e9b386548fe64276bbf938a545c898de599113f20cc73ae98268c3d6a
24
25 diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.7.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.7.0.ebuild
26 deleted file mode 100644
27 index 5a1a4386433..00000000000
28 --- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.7.0.ebuild
29 +++ /dev/null
30 @@ -1,69 +0,0 @@
31 -# Copyright 1999-2020 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=7
35 -
36 -inherit cmake
37 -
38 -if [[ ${PV} == *9999 ]] ; then
39 - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
40 - inherit git-r3
41 -else
42 - SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
43 - KEYWORDS="~amd64"
44 - S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
45 -fi
46 -
47 -DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
48 -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
49 -
50 -LICENSE="Apache-2.0 MIT"
51 -SLOT="0/$(ver_cut 1-2)"
52 -
53 -RDEPEND=">=dev-libs/rocr-runtime-${PV}
54 - >=dev-libs/rocclr-${PV}
55 - >=dev-libs/rocm-comgr-${PV}
56 - >=dev-libs/rocm-device-libs-${PV}
57 - >=virtual/opencl-3
58 - media-libs/mesa"
59 -DEPEND="${RDEPEND}
60 - dev-lang/ocaml
61 - dev-ml/findlib"
62 -BDEPEND=">=dev-util/rocm-cmake-${PV}"
63 -
64 -PATCHES=(
65 - "${FILESDIR}/${PN}-3.7.0-change-install-location.patch"
66 - "${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
67 - "${FILESDIR}/${PN}-3.7.0-add-rocclr-include-directories.patch"
68 - "${FILESDIR}/${PN}-3.7.0-amdocl64icd.patch"
69 -)
70 -
71 -src_prepare() {
72 - # Remove "clinfo" - use "dev-util/clinfo" instead
73 - [ -d tools/clinfo ] && rm -rf tools/clinfo || die
74 -
75 - # Wrong position of a '"' results in a list of strings instead of a single string and the build fails...
76 - 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"
77 -
78 - cmake_src_prepare
79 -}
80 -
81 -src_configure() {
82 - # Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
83 - append-cflags -fcommon
84 -
85 - local mycmakeargs=(
86 - -DUSE_COMGR_LIBRARY=yes
87 - -DROCclr_DIR="${EPREFIX}/usr/include/rocclr"
88 - -DLIBROCclr_STATIC_DIR="${EPREFIX}/usr/lib/cmake/rocclr"
89 - )
90 - cmake_src_configure
91 -}
92 -
93 -src_install() {
94 - cd "${BUILD_DIR}" || die
95 - insinto /etc/OpenCL/vendors
96 - doins amdocl64.icd
97 - insinto /usr/lib64
98 - doins lib/libamdocl64.so
99 -}