[gentoo-commits] repo/gentoo:master commit in: dev-libs/rocclr/files/, dev-libs/rocclr/

[Craig Andrews]

commit:     9021e1b9f4dd9866aa14a4aa0573cfa9236d9637
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 21:03:32 2020 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 21:08:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9021e1b9

dev-libs/rocclr: Cleanup old versions

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 dev-libs/rocclr/Manifest                           |  2 -
 .../rocclr-3.5.0-cmake-install-destination.patch   | 53 ----------------------
 .../rocclr/files/rocclr-3.5.0-find-opencl.patch    | 49 --------------------
 dev-libs/rocclr/rocclr-3.5.0-r1.ebuild             | 46 -------------------
 4 files changed, 150 deletions(-)

diff --git a/dev-libs/rocclr/Manifest b/dev-libs/rocclr/Manifest
index db1461ad805..9fc638b52cc 100644
--- a/dev-libs/rocclr/Manifest
+++ b/dev-libs/rocclr/Manifest
@@ -1,4 +1,2 @@
-DIST rocclr-3.5.0.tar.gz 874139 BLAKE2B 027403d51c86aa492c0951f8d75bd90493fc0fbe99987e9f443a9fa0b86fc69335a4a6625b5af67231b99c9e0b0adbd914e11369fb2a2b1acb3b5254e475b09f SHA512 732c439f900896c0e065b64054a789edbc0258a0e53723077e578b99bd59925517b201c31a428389cc0dbd100051df8344378aee4a0c2c294110ad9bcf1a3098
 DIST rocclr-3.7.0.tar.gz 881814 BLAKE2B 5d7c70d52d8c06e421bdf2a02dba35ed70509c9154fbe3b8c3193969b37970d5f52d1a67eff46abe95b8af1932f2c6931b18380d046f633a3870fe95c4bfc651 SHA512 8684cc9b4f9f63ef65bcc286b74c51e3f7d334f0245b5a1fca6d3dfa0bb552fccb6b82419b538aebe1d316aa2c41a28a9a21df459b734aa44923d66d725834e1
-DIST rocm-opencl-runtime-3.5.0.tar.gz 734076 BLAKE2B cc6992999188968c628b378f637c8073c99381fab42e05d7d9d89d75fe9f2bd3d573f61f00a18c078542f7fc4a3a856385d0f34fa9bb599dd63de8be18594bdf SHA512 658649c3f13d32308f8f031f26b62c20bda4841059b5ea0db5c6a827af26b07aa0bdee07a461cc4b3c37108b3f25ae59b1658fab30125f84c0729fb57c2fa014
 DIST rocm-opencl-runtime-3.7.0.tar.gz 1004361 BLAKE2B 7fa9481c77884dda15a3b0335449b2879fbac000f644fc56bbd8d06c5fd77d8355f159b9b7e8920f06351e388d0df41379b7e1fcff51cf81714a28f902218e42 SHA512 6ea509dde0290f13e66497eaad587099ed6a98df967adce207afc857ecd961b65801332ca74e36173719488639480cfcffc625a007345d0e48c10c8a0efdfa3f

diff --git a/dev-libs/rocclr/files/rocclr-3.5.0-cmake-install-destination.patch b/dev-libs/rocclr/files/rocclr-3.5.0-cmake-install-destination.patch
deleted file mode 100644
index 4f915284f62..00000000000
--- a/dev-libs/rocclr/files/rocclr-3.5.0-cmake-install-destination.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/CMakeLists.txt	2020-06-07 13:12:46.497062447 +0200
-+++ b/CMakeLists.txt	2020-06-07 13:13:44.401062226 +0200
-@@ -202,40 +202,40 @@
- #endif()
- endif()
- 
--install( TARGETS amdrocclr_static ARCHIVE DESTINATION lib LIBRARY DESTINATION lib COMPONENT applications)
-+install( TARGETS amdrocclr_static ARCHIVE DESTINATION lib64 LIBRARY DESTINATION lib64 COMPONENT applications)
- file(GLOB headerfiles "${CMAKE_CURRENT_SOURCE_DIR}/*.h*")
- install (
-     FILES ${headerfiles}
--    DESTINATION include)
-+    DESTINATION include/rocclr)
- install (
-    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include"
--   DESTINATION include
-+   DESTINATION include/rocclr
-    FILES_MATCHING PATTERN "*.h*")
- install (
-    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/elf"
--   DESTINATION include
-+   DESTINATION include/rocclr
-    FILES_MATCHING PATTERN "*.h*")
- install (
-    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/compiler"
--   DESTINATION include
-+   DESTINATION include/rocclr
-    FILES_MATCHING PATTERN "*.h*")
- install (
-    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/utils"
--   DESTINATION include
-+   DESTINATION include/rocclr
-    FILES_MATCHING PATTERN "*.h*")
- install (
-    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/platform"
--   DESTINATION include
-+   DESTINATION include/rocclr
-    FILES_MATCHING PATTERN "*.h*")
- install (
-    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/thread"
--   DESTINATION include
-+   DESTINATION include/rocclr
-    FILES_MATCHING PATTERN "*.h*")
- install (
-    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/os"
--   DESTINATION include
-+   DESTINATION include/rocclr
-    FILES_MATCHING PATTERN "*.h*")
- install (
-    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/device"
--   DESTINATION include
-+   DESTINATION include/rocclr
-    FILES_MATCHING PATTERN "*.h*")

diff --git a/dev-libs/rocclr/files/rocclr-3.5.0-find-opencl.patch b/dev-libs/rocclr/files/rocclr-3.5.0-find-opencl.patch
deleted file mode 100644
index fc9bacee502..00000000000
--- a/dev-libs/rocclr/files/rocclr-3.5.0-find-opencl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 98df37fc36b6276c26532e86e89be7e389745f4e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Torsten=20Ke=C3=9Fler?= <t.kessler@××××××.de>
-Date: Sun, 19 Jul 2020 11:58:24 +0200
-Subject: [PATCH] Fix search for OpenCL include dirs
-
----
- CMakeLists.txt | 26 +++++++++-----------------
- 1 file changed, 9 insertions(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 122277ee..02ca4644 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,26 +53,18 @@ find_package(amd_comgr REQUIRED CONFIG
- )
- message(STATUS "Code Object Manager found at ${amd_comgr_DIR}.")
- 
--# FIXME: Use find_package(OpenCL)
--find_library( OpenCL REQUIRED CONFIG
--   PATHS
--      /opt/rocm
-+find_path(OPENCL_INCLUDE_DIR
-+   NAMES OpenCL/cl.h CL/cl.h
-+   PATH_SUFFIXES include opencl/include inc include/x86_64 include/x64
-+   PATHS ${OPENCL_DIR}
-+   DOC "OpenCL include header OpenCL/cl.h or CL/cl.h"
- )
- 
--if( NOT OPENCL_DIR )
--   find_path(OPENCL_INCLUDE_DIR
--      NAMES OpenCL/cl.h CL/cl.h
--      PATH_SUFFIXES include opencl/include inc include/x86_64 include/x64
--      PATHS /opt/rocm
--      DOC "OpenCL include header OpenCL/cl.h or CL/cl.h"
--   )
--
--   if( NOT OPENCL_INCLUDE_DIR )
--      unset(OPENCL_INCLUDE_DIR CACHE)
--      set(OPENCL_INCLUDE_DIR "" CACHE PATH "" FORCE )
--   endif()
--      message(STATUS "Opencl found at ${OPENCL_INCLUDE_DIR}.")
-+if( NOT OPENCL_INCLUDE_DIR )
-+   unset(OPENCL_INCLUDE_DIR CACHE)
-+   set(OPENCL_INCLUDE_DIR "" CACHE PATH "" FORCE )
- endif()
-+message(STATUS "Opencl found at ${OPENCL_INCLUDE_DIR}.")
- 
- 
- 

diff --git a/dev-libs/rocclr/rocclr-3.5.0-r1.ebuild b/dev-libs/rocclr/rocclr-3.5.0-r1.ebuild
deleted file mode 100644
index 2601b431de1..00000000000
--- a/dev-libs/rocclr/rocclr-3.5.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Radeon Open Compute Common Language Runtime"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/ROCclr"
-SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/roc-${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-libs/rocm-comgr-${PV}"
-DEPEND="${RDEPEND}
-	>=dev-libs/rocm-comgr-${PV}
-	virtual/opengl
-	>=dev-util/rocm-cmake-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/rocclr-3.5.0-cmake-install-destination.patch"
-	"${FILESDIR}/rocclr-3.5.0-find-opencl.patch"
-)
-
-S="${WORKDIR}/ROCclr-roc-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_COMGR_LIBRARY=YES
-		-DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}"
-		-DCMAKE_INSTALL_PREFIX="/usr"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	# This should be fixed in the CMakeLists.txt to get this installed automatically
-	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr/$(get_libdir):" -i "${BUILD_DIR}/amdrocclr_staticTargets.cmake"
-	insinto /usr/$(get_libdir)/cmake/rocclr
-	doins "${BUILD_DIR}/amdrocclr_staticTargets.cmake"
-
-	cmake_src_install
-}