[gentoo-commits] repo/gentoo:master commit in: dev-util/hip/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Benda XU" <heroxbd@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/hip/
Date: Tue, 31 Jan 2023 13:32:27 +0000 (UTC)	[thread overview]
Message-ID: <1675171494.6af722a55be4b47e0984d9e8b2a186eff645cb47.heroxbd@gentoo> (raw)

commit:     6af722a55be4b47e0984d9e8b2a186eff645cb47
Author:     Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Mon Jan 23 08:16:56 2023 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Jan 31 13:24:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6af722a5

dev-util/hip: Avoid double prefix problems

hprefixify on hip-config.cmake and hipcc.pl is not working well.
Disable auto hprefixify and adjust manual modification instead.

Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 dev-util/hip/{hip-5.1.3-r3.ebuild => hip-5.1.3-r4.ebuild} | 10 +++++-----
 dev-util/hip/{hip-5.3.3-r1.ebuild => hip-5.3.3-r2.ebuild} | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dev-util/hip/hip-5.1.3-r3.ebuild b/dev-util/hip/hip-5.1.3-r4.ebuild
similarity index 94%
rename from dev-util/hip/hip-5.1.3-r3.ebuild
rename to dev-util/hip/hip-5.1.3-r4.ebuild
index 56090c5077df..3ea312756ff5 100644
--- a/dev-util/hip/hip-5.1.3-r3.ebuild
+++ b/dev-util/hip/hip-5.1.3-r4.ebuild
@@ -105,19 +105,19 @@ src_prepare() {
 	# which makes "stdlib.h" not found when using "#include_next" in header files;
 	sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \
 		-e "/HIP.*FLAGS.*isystem.*HIP_INCLUDE_PATH/d" \
-		-e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \
-		-e "s:\$ENV{'HIP_LIB_PATH'}:'/usr/$(get_libdir)':" \
+		-e "s:\$ENV{'DEVICE_LIB_PATH'}:'${EPREFIX}/usr/lib/amdgcn/bitcode':" \
+		-e "s:\$ENV{'HIP_LIB_PATH'}:'${EPREFIX}/usr/$(get_libdir)':" \
 		-e "/rpath/s,--rpath=[^ ]*,," \
 		-e "s,\$HIP_CLANG_PATH/../lib/clang/\$HIP_CLANG_VERSION/,${CLANG_RESOURCE_DIR}/,g" \
 		-i bin/hipcc.pl || die
 
 	# change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs"
-	sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \
+	sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:${EPREFIX}/usr/lib/amdgcn/bitcode:" \
 		-i "${S}/hip-config.cmake.in" || die
 
 	einfo "prefixing hipcc and its utils..."
-	hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}")
-	hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${HIP_S}")
+	hprefixify $(grep -rl --exclude-dir=build/ --exclude="hip-config.cmake.in" "/usr" "${S}")
+	hprefixify $(grep -rl --exclude-dir=build/ --exclude="hipcc.pl" "/usr" "${HIP_S}")
 
 	cp "$(prefixify_ro "${FILESDIR}"/hipvars-5.1.3.pm)" bin/hipvars.pm || die "failed to replace hipvars.pm"
 	sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \

diff --git a/dev-util/hip/hip-5.3.3-r1.ebuild b/dev-util/hip/hip-5.3.3-r2.ebuild
similarity index 93%
rename from dev-util/hip/hip-5.3.3-r1.ebuild
rename to dev-util/hip/hip-5.3.3-r2.ebuild
index 07b7709afbc2..bf43460c20d0 100644
--- a/dev-util/hip/hip-5.3.3-r1.ebuild
+++ b/dev-util/hip/hip-5.3.3-r2.ebuild
@@ -97,19 +97,19 @@ src_prepare() {
 	# which makes "stdlib.h" not found when using "#include_next" in header files;
 	sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \
 		-e "/HIP.*FLAGS.*isystem.*HIP_INCLUDE_PATH/d" \
-		-e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \
-		-e "s:\$ENV{'HIP_LIB_PATH'}:'/usr/$(get_libdir)':" \
+		-e "s:\$ENV{'DEVICE_LIB_PATH'}:'${EPREFIX}/usr/lib/amdgcn/bitcode':" \
+		-e "s:\$ENV{'HIP_LIB_PATH'}:'${EPREFIX}/usr/$(get_libdir)':" \
 		-e "/rpath/s,--rpath=[^ ]*,," \
 		-e "s,\$HIP_CLANG_PATH/../lib/clang/\$HIP_CLANG_VERSION/,${CLANG_RESOURCE_DIR}/,g" \
 		-i bin/hipcc.pl || die
 
 	# change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs"
-	sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \
+	sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:${EPREFIX}/usr/lib/amdgcn/bitcode:" \
 		-i "${S}/hip-config.cmake.in" || die
 
 	einfo "prefixing hipcc and its utils..."
-	hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}")
-	hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${HIP_S}")
+	hprefixify $(grep -rl --exclude-dir=build/ --exclude="hip-config.cmake.in" "/usr" "${S}")
+	hprefixify $(grep -rl --exclude-dir=build/ --exclude="hipcc.pl" "/usr" "${HIP_S}")
 
 	cp "$(prefixify_ro "${FILESDIR}"/hipvars-5.1.3.pm)" bin/hipvars.pm || die "failed to replace hipvars.pm"
 	sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \

next             reply	other threads:[~2023-01-31 13:32 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-31 13:32 Benda XU [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-13  8:38 [gentoo-commits] repo/gentoo:master commit in: dev-util/hip/ Sam James
2025-02-08 10:07 Patrick Lauer
2024-12-01  7:57 Patrick Lauer
2024-07-28  8:04 Patrick Lauer
2024-06-26  9:21 Sam James
2024-06-26  9:21 Sam James
2024-03-12  2:25 Sam James
2024-03-08 19:22 Sam James
2024-03-08 19:22 Sam James
2024-03-08 19:22 Sam James
2024-01-06  7:21 Sam James
2024-01-06  7:21 Sam James
2023-12-23 10:43 罗百科
2023-12-14 15:02 Benda XU
2023-12-14 15:02 Benda XU
2023-11-19 11:30 罗百科
2023-10-30  9:22 罗百科
2023-10-27  8:14 Andrew Ammerlaan
2023-10-19 10:38 罗百科
2023-02-22 16:16 Sam James
2023-01-31 13:32 Benda XU
2023-01-31 13:32 Benda XU
2023-01-31 13:32 Benda XU
2023-01-31 13:32 Benda XU
2023-01-31 13:32 Benda XU
2022-12-20  9:26 罗百科
2022-10-08 12:40 Arthur Zamarin
2022-09-12  8:41 Benda XU
2022-09-12  8:41 Benda XU
2022-06-22 13:03 Benda XU
2022-03-27  3:26 Benda XU
2022-03-27  3:18 Benda XU
2022-03-25 15:52 Benda XU
2022-03-05 20:51 Andrew Ammerlaan
2022-01-24 14:46 Benda XU
2021-08-03  7:04 Benda XU
2021-08-03  1:35 Benda XU
2021-01-20  5:36 Benda XU

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:56090c5077d dfblob:3ea312756ff dfblob:07b7709afbc
dfblob:bf43460c20d )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: dev-util/hip/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1675171494.6af722a55be4b47e0984d9e8b2a186eff645cb47.heroxbd@gentoo \
    --to=heroxbd@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox