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 960E4139360 for ; Tue, 3 Aug 2021 07:04:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 834D9E09F8; Tue, 3 Aug 2021 07:04:13 +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 E813EE09F8 for ; Tue, 3 Aug 2021 07:04:12 +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 4BA73343A3F for ; Tue, 3 Aug 2021 07:04:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D3B787BD for ; Tue, 3 Aug 2021 07:04:09 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1627974244.5a4c851cefaf1190ce9e0ac2d40866a74e06d070.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/hip/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/hip/hip-4.1.0-r1.ebuild X-VCS-Directories: dev-util/hip/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 5a4c851cefaf1190ce9e0ac2d40866a74e06d070 X-VCS-Branch: master Date: Tue, 3 Aug 2021 07:04:09 +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: cc6164da-3bbf-441a-a10b-f8c4a21f6294 X-Archives-Hash: 12121b5f11ee24f3a3d4270c3a6c86d8 commit: 5a4c851cefaf1190ce9e0ac2d40866a74e06d070 Author: Benda Xu gentoo org> AuthorDate: Tue Aug 3 07:03:52 2021 +0000 Commit: Benda XU gentoo org> CommitDate: Tue Aug 3 07:04:04 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a4c851c dev-util/hip: use SLOT in DEPEND and soname. The ROCm ecosystem is made of tightly bundled packages with the same versions. Use sub-SLOT to express this requirement for better handling of rebuilds. Prefixify hipvars.pm. Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Benda Xu gentoo.org> dev-util/hip/hip-4.1.0-r1.ebuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-util/hip/hip-4.1.0-r1.ebuild b/dev-util/hip/hip-4.1.0-r1.ebuild index ff12517ad83..827305877f9 100644 --- a/dev-util/hip/hip-4.1.0-r1.ebuild +++ b/dev-util/hip/hip-4.1.0-r1.ebuild @@ -17,8 +17,8 @@ IUSE="debug profile" # Don't strip to prevent some tests from failing. RESTRICT="strip" -DEPEND=">=dev-libs/rocclr-$(ver_cut 1-2) - >=dev-util/rocminfo-$(ver_cut 1-2) +DEPEND="dev-libs/rocclr:${SLOT} + dev-util/rocminfo:${SLOT} =sys-devel/llvm-roc-${PV}*[runtime]" RDEPEND="${DEPEND}" @@ -35,8 +35,8 @@ src_prepare() { cmake_src_prepare eapply_user - # Use Gentoo version number, otherwise git hash is attempted in vain. - sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${PVR})" -i CMakeLists.txt || die + # Use Gentoo slot number, otherwise git hash is attempted in vain. + sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${SLOT#*/})" -i CMakeLists.txt || die # disable PCH, because it results in a build error in ROCm 4.0.0 sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i CMakeLists.txt || die @@ -58,7 +58,7 @@ src_prepare() { einfo "prefixing hipcc and its utils..." hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}") - cp "${FILESDIR}"/hipvars.pm bin/ || die "failed to replace hipvars.pm" + cp "$(prefixify_ro "${FILESDIR}"/hipvars.pm)" bin/ || die "failed to replace hipvars.pm" } src_configure() {