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

["Craig Andrews" <candrews@gentoo.org>]

commit:     ae21020147699ac175dcbdd89b271b5cb762c540
Author:     Wilfried Holzke <gentoo <AT> holzke <DOT> net>
AuthorDate: Sat Aug 22 17:55:33 2020 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 17:49:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae210201

dev-libs/rocr-runtime: Version bump to 3.7.0

Signed-off-by: Wilfried Holzke <gentoo <AT> holzke.net>
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Closes: https://github.com/gentoo/gentoo/pull/17213
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 dev-libs/rocr-runtime/Manifest                     |  1 +
 .../rocr-runtime-3.7.0-cmake-install-paths.patch   | 53 ++++++++++++++++++++++
 dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild    | 47 +++++++++++++++++++
 3 files changed, 101 insertions(+)

diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index 443bde5eed8..d0f1a066964 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -2,3 +2,4 @@ DIST rocr-runtime-3.0.0.tar.gz 327908 BLAKE2B 0d95ecc22d27e470dd46f02aca012c59e8
 DIST rocr-runtime-3.1.0.tar.gz 329176 BLAKE2B 845dcfc5a00e6d571bfef6330b370f588496de95ee7e04caf9c29f81e389f3e82dcdace11d48c86b01119cc0e73bf0a50949da9c4f5383044360f59176670d95 SHA512 a9b540341c649786aa0b53755fc51f540425d67c5a567834abbef9bb55c9b0120b1f14c082bfbc97f3c2a586aa846853f293093116aa8625dc34cae6fe50683a
 DIST rocr-runtime-3.3.0.tar.gz 329386 BLAKE2B 59eb0838d377bb8b10887d7fb432e634190196516fff30a9401b591f2bb7846938c5486bac921fb4fce905a3acfbf4dd064ed9b53122da847fd5fb3d3d2f701c SHA512 ec7950aacd84c318978b9abbad0aafcae1e2d7d7c77806432bde0ce861372e6db92d74ba6445d3ac92c835aa0137b1929d27ddee77b9dae92ca2465a70c4878d
 DIST rocr-runtime-3.5.0.tar.gz 336269 BLAKE2B afde0f9fcfad389a56f31352036174b8b2a5e9960f5bbcff8a7ca9dc54e4b68d92b70afa70af5aa43d040749bccd2df957df89fea1036890abdaf7e6a5c3b620 SHA512 20d95b13dccf2fe5b8da5859661a21279f18d1c45899782c55477265500057708360ce2049a8e9b3aadbcb33f8e4274459edb17a8455dc3db69ccf31b86a581e
+DIST rocr-runtime-3.7.0.tar.gz 691234 BLAKE2B b0f3b1ff6c13c132d00bbf30d405746e793aae377aca2279117c7b9dd6fdc1d466ef2076947061c848913378a20ee0dc7e32847c62a7416e4088ab0705d17dfd SHA512 f7fa77524d7f63980194e93a8e3124f1471dcdfec6ede5eb993699083e5d8fba28737fcc63dbd61949e3ce60e9fbd1455ec055a0aa5c7eee724ae6bb61d3b24f

diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-3.7.0-cmake-install-paths.patch b/dev-libs/rocr-runtime/files/rocr-runtime-3.7.0-cmake-install-paths.patch
new file mode 100644
index 00000000000..ccf397d8092
--- /dev/null
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-3.7.0-cmake-install-paths.patch
@@ -0,0 +1,53 @@
+--- a/CMakeLists.txt	2020-08-22 18:24:27.991014917 +0200
++++ b/CMakeLists.txt	2020-08-22 18:48:03.209009518 +0200
+@@ -296,34 +296,36 @@
+ endif()
+ 
+ ## Create symlinks for legacy packaging and install
+-add_custom_target ( hsa_include_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../include/hsa hsa_include_link )
+-if ( ${BUILD_SHARED_LIBS} )
+-    add_custom_target ( hsa_lib_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}-link.so )
+-    add_custom_target ( hsa_lib_link2 ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../lib/${CORE_RUNTIME_LIBRARY}.so.${VERSION_MAJOR} ${CORE_RUNTIME_LIBRARY}-link.so.${VERSION_MAJOR} )
+-endif()
++#add_custom_target ( hsa_include_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../include/hsa hsa_include_link )
++#if ( ${BUILD_SHARED_LIBS} )
++#    add_custom_target ( hsa_lib_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}-link.so )
++#    add_custom_target ( hsa_lib_link2 ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../lib/${CORE_RUNTIME_LIBRARY}.so.${VERSION_MAJOR} ${CORE_RUNTIME_LIBRARY}-link.so.${VERSION_MAJOR} )
++#endif()
+ 
+ ## Set install information
+ # Installs binaries and exports the library usage data to ${HSAKMT_TARGET}Targets
+ # TODO: Fix me for flat directory layout.  Should be ${CMAKE_INSTALL_LIBDIR}
+-install ( TARGETS ${CORE_RUNTIME_TARGET} EXPORT ${CORE_RUNTIME_NAME}Targets 
+-  ARCHIVE DESTINATION lib COMPONENT binary
+-  LIBRARY DESTINATION lib COMPONENT binary )
++#install ( TARGETS ${CORE_RUNTIME_TARGET} EXPORT ${CORE_RUNTIME_NAME}Targets
++#  ARCHIVE DESTINATION lib COMPONENT binary
++#  LIBRARY DESTINATION lib COMPONENT binary )
++install ( TARGETS ${CORE_RUNTIME_TARGET} EXPORT ${CORE_RUNTIME_NAME}Targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+ 
+ # Install license
+ #install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT binary )
+ 
+ # Install public headers
+ # TODO: Fix me for flat directory layout.  Should be ${CMAKE_INSTALL_INCLUDEDIR}
+-install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION include/hsa COMPONENT dev )
++#install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION include/hsa COMPONENT dev )
++install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa )
+ 
+ # Legacy symlink.
+-install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION hsa/include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa COMPONENT dirlink)
++#install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION hsa/include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa COMPONENT dirlink)
+ 
+ # Legacy symlinks.
+-if ( ${BUILD_SHARED_LIBS} )
+-    install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so DESTINATION hsa/lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so COMPONENT binary)
+-    install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so.${VERSION_MAJOR} DESTINATION hsa/lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so.${VERSION_MAJOR} COMPONENT binary)
+-endif ()
++#if ( ${BUILD_SHARED_LIBS} )
++#    install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so DESTINATION hsa/lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so COMPONENT binary)
++#    install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so.${VERSION_MAJOR} DESTINATION hsa/lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so.${VERSION_MAJOR} COMPONENT binary)
++#endif ()
+ 
+ ## Configure and install package config file
+ # Record our usage data for clients find_package calls.

diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild
new file mode 100644
index 00000000000..19f5c3ad9ae
--- /dev/null
+++ b/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/src"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
+PATCHES=(
+	"${FILESDIR}/${PN}-3.7.0-cmake-install-paths.patch"
+)
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="non-free"
+
+COMMON_DEPEND="sys-process/numactl"
+RDEPEND="${COMMON_DEPEND}
+	non-free? ( dev-libs/hsa-ext-rocr )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/roct-thunk-interface-${PV}
+	>=dev-libs/rocm-device-libs-${PV}
+	app-editors/vim-core"
+	# vim-core is needed for "xxd"
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+
+	# ... otherwise system llvm/clang is used ...
+	sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS /usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die
+
+	# Gentoo install "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ...
+	sed -e "s:/opt/rocm/amdgcn/bitcode:/usr/lib:" -i image/blit_src/CMakeLists.txt || die
+
+	cmake_src_prepare
+}