From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1199926-garchives=archives.gentoo.org@lists.gentoo.org> 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 11E6113835A for <garchives@archives.gentoo.org>; Tue, 25 Aug 2020 21:08:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 792FDE0974; Tue, 25 Aug 2020 21:08:19 +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 5382BE0974 for <gentoo-commits@lists.gentoo.org>; Tue, 25 Aug 2020 21:08:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 47833340EC7 for <gentoo-commits@lists.gentoo.org>; Tue, 25 Aug 2020 21:08:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 66224339 for <gentoo-commits@lists.gentoo.org>; Tue, 25 Aug 2020 21:08:15 +0000 (UTC) From: "Craig Andrews" <candrews@gentoo.org> 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" <candrews@gentoo.org> Message-ID: <1598389688.a762bf47f145488ae284c1601e253320f336fb3d.candrews@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocr-runtime/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/rocr-runtime/metadata.xml dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild dev-libs/rocr-runtime/rocr-runtime-9999.ebuild X-VCS-Directories: dev-libs/rocr-runtime/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: a762bf47f145488ae284c1601e253320f336fb3d X-VCS-Branch: master Date: Tue, 25 Aug 2020 21:08:15 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1cd454c7-1a6f-403b-9c2d-c398d9615157 X-Archives-Hash: 78e086c0e601f99e0eb48a131e45e598 commit: a762bf47f145488ae284c1601e253320f336fb3d Author: Craig Andrews <candrews <AT> gentoo <DOT> org> AuthorDate: Tue Aug 25 21:07:30 2020 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Tue Aug 25 21:08:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a762bf47 dev-libs/rocr-runtime: Remove USE="non-free" Upstream no longer publishes the dev-libs/hsa-ext-rocr library. ROC has had open-source OpenCL image support since 3.3. Closes: https://bugs.gentoo.org/716930 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> dev-libs/rocr-runtime/metadata.xml | 3 --- dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild | 4 +--- dev-libs/rocr-runtime/rocr-runtime-9999.ebuild | 19 +++++++++++++++---- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dev-libs/rocr-runtime/metadata.xml b/dev-libs/rocr-runtime/metadata.xml index e13e7321708..d53b83185ad 100644 --- a/dev-libs/rocr-runtime/metadata.xml +++ b/dev-libs/rocr-runtime/metadata.xml @@ -15,7 +15,4 @@ <longdescription lang="en"> Radeon Open Compute Platform Runtime </longdescription> - <use> - <flag name="non-free">Enables HSA image support using <pkg>dev-libs/hsa-ext-rocr</pkg></flag> - </use> </pkgmetadata> diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild index 064969d47e2..d69d702b2de 100644 --- a/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild +++ b/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild @@ -23,11 +23,9 @@ PATCHES=( 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 )" +RDEPEND="${COMMON_DEPEND}" DEPEND="${COMMON_DEPEND} >=dev-libs/roct-thunk-interface-${PV} >=dev-libs/rocm-device-libs-${PV} diff --git a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild index 5ddab400ad0..d69d702b2de 100644 --- a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild +++ b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild @@ -17,18 +17,29 @@ 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 )" +RDEPEND="${COMMON_DEPEND}" DEPEND="${COMMON_DEPEND} - >=dev-libs/roct-thunk-interface-${PV}" + >=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 installs "*.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 }