From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 36BF41382C5 for ; Mon, 8 Jun 2020 18:19:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5F8F8E0960; Mon, 8 Jun 2020 18:19:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 37E47E0960 for ; Mon, 8 Jun 2020 18:19:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D761034F11F for ; Mon, 8 Jun 2020 18:19:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BBCB021D for ; Mon, 8 Jun 2020 18:19:47 +0000 (UTC) From: "Craig Andrews" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Craig Andrews" Message-ID: <1591639952.828795a9fd9bbef823b4a11284eb7dbc1036abf9.candrews@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocclr/files/, dev-libs/rocclr/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/rocclr/Manifest dev-libs/rocclr/files/rocclr-3.5.0-cmake-install-destination.patch dev-libs/rocclr/metadata.xml dev-libs/rocclr/rocclr-3.5.0.ebuild X-VCS-Directories: dev-libs/rocclr/files/ dev-libs/rocclr/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: 828795a9fd9bbef823b4a11284eb7dbc1036abf9 X-VCS-Branch: master Date: Mon, 8 Jun 2020 18:19:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ba726510-f516-4239-96ef-d26fc66344b1 X-Archives-Hash: f2f77a2c019ac44a694d6abe05a53142 commit: 828795a9fd9bbef823b4a11284eb7dbc1036abf9 Author: Wilfried Holzke holzke net> AuthorDate: Mon Jun 8 16:54:53 2020 +0000 Commit: Craig Andrews gentoo org> CommitDate: Mon Jun 8 18:12:32 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=828795a9 dev-libs/rocclr: Radeon Open Compute Common Language Runtime Signed-off-by: Wilfried Holzke holzke.net> Package-Manager: Portage-2.3.99, Repoman-2.3.22 Closes: https://github.com/gentoo/gentoo/pull/16123 Signed-off-by: Craig Andrews gentoo.org> dev-libs/rocclr/Manifest | 2 + .../rocclr-3.5.0-cmake-install-destination.patch | 53 ++++++++++++++++++++++ dev-libs/rocclr/metadata.xml | 11 +++++ dev-libs/rocclr/rocclr-3.5.0.ebuild | 43 ++++++++++++++++++ 4 files changed, 109 insertions(+) diff --git a/dev-libs/rocclr/Manifest b/dev-libs/rocclr/Manifest new file mode 100644 index 00000000000..d0db694a40d --- /dev/null +++ b/dev-libs/rocclr/Manifest @@ -0,0 +1,2 @@ +DIST rocclr-3.5.0.tar.gz 874139 BLAKE2B 027403d51c86aa492c0951f8d75bd90493fc0fbe99987e9f443a9fa0b86fc69335a4a6625b5af67231b99c9e0b0adbd914e11369fb2a2b1acb3b5254e475b09f SHA512 732c439f900896c0e065b64054a789edbc0258a0e53723077e578b99bd59925517b201c31a428389cc0dbd100051df8344378aee4a0c2c294110ad9bcf1a3098 +DIST rocm-opencl-runtime-3.5.0.tar.gz 734076 BLAKE2B cc6992999188968c628b378f637c8073c99381fab42e05d7d9d89d75fe9f2bd3d573f61f00a18c078542f7fc4a3a856385d0f34fa9bb599dd63de8be18594bdf SHA512 658649c3f13d32308f8f031f26b62c20bda4841059b5ea0db5c6a827af26b07aa0bdee07a461cc4b3c37108b3f25ae59b1658fab30125f84c0729fb57c2fa014 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 new file mode 100644 index 00000000000..4f915284f62 --- /dev/null +++ b/dev-libs/rocclr/files/rocclr-3.5.0-cmake-install-destination.patch @@ -0,0 +1,53 @@ +--- 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/metadata.xml b/dev-libs/rocclr/metadata.xml new file mode 100644 index 00000000000..616c77e17ed --- /dev/null +++ b/dev-libs/rocclr/metadata.xml @@ -0,0 +1,11 @@ + + + + + candrews@gentoo.org + Craig Andrews + + + ROCm-Developer-Tools/ROCclr + + diff --git a/dev-libs/rocclr/rocclr-3.5.0.ebuild b/dev-libs/rocclr/rocclr-3.5.0.ebuild new file mode 100644 index 00000000000..f66fac33e21 --- /dev/null +++ b/dev-libs/rocclr/rocclr-3.5.0.ebuild @@ -0,0 +1,43 @@ +# 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-util/rocm-cmake-${PV}" + +PATCHES=( + "${FILESDIR}/rocclr-3.5.0-cmake-install-destination.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:/var/tmp/portage/dev-libs/${PF}/work/rocclr-${PV}_build:/usr/lib64:" -i "${BUILD_DIR}/amdrocclr_staticTargets.cmake" + insinto /usr/lib64/cmake/rocclr + doins "${BUILD_DIR}/amdrocclr_staticTargets.cmake" + + cmake_src_install +}