| 1 |
commit: 6af722a55be4b47e0984d9e8b2a186eff645cb47 |
| 2 |
Author: Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Jan 23 08:16:56 2023 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 31 13:24:54 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6af722a5 |
| 7 |
|
| 8 |
dev-util/hip: Avoid double prefix problems |
| 9 |
|
| 10 |
hprefixify on hip-config.cmake and hipcc.pl is not working well. |
| 11 |
Disable auto hprefixify and adjust manual modification instead. |
| 12 |
|
| 13 |
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com> |
| 14 |
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org> |
| 15 |
|
| 16 |
dev-util/hip/{hip-5.1.3-r3.ebuild => hip-5.1.3-r4.ebuild} | 10 +++++----- |
| 17 |
dev-util/hip/{hip-5.3.3-r1.ebuild => hip-5.3.3-r2.ebuild} | 10 +++++----- |
| 18 |
2 files changed, 10 insertions(+), 10 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-util/hip/hip-5.1.3-r3.ebuild b/dev-util/hip/hip-5.1.3-r4.ebuild |
| 21 |
similarity index 94% |
| 22 |
rename from dev-util/hip/hip-5.1.3-r3.ebuild |
| 23 |
rename to dev-util/hip/hip-5.1.3-r4.ebuild |
| 24 |
index 56090c5077df..3ea312756ff5 100644 |
| 25 |
--- a/dev-util/hip/hip-5.1.3-r3.ebuild |
| 26 |
+++ b/dev-util/hip/hip-5.1.3-r4.ebuild |
| 27 |
@@ -105,19 +105,19 @@ src_prepare() { |
| 28 |
# which makes "stdlib.h" not found when using "#include_next" in header files; |
| 29 |
sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \ |
| 30 |
-e "/HIP.*FLAGS.*isystem.*HIP_INCLUDE_PATH/d" \ |
| 31 |
- -e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \ |
| 32 |
- -e "s:\$ENV{'HIP_LIB_PATH'}:'/usr/$(get_libdir)':" \ |
| 33 |
+ -e "s:\$ENV{'DEVICE_LIB_PATH'}:'${EPREFIX}/usr/lib/amdgcn/bitcode':" \ |
| 34 |
+ -e "s:\$ENV{'HIP_LIB_PATH'}:'${EPREFIX}/usr/$(get_libdir)':" \ |
| 35 |
-e "/rpath/s,--rpath=[^ ]*,," \ |
| 36 |
-e "s,\$HIP_CLANG_PATH/../lib/clang/\$HIP_CLANG_VERSION/,${CLANG_RESOURCE_DIR}/,g" \ |
| 37 |
-i bin/hipcc.pl || die |
| 38 |
|
| 39 |
# change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs" |
| 40 |
- sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \ |
| 41 |
+ sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:${EPREFIX}/usr/lib/amdgcn/bitcode:" \ |
| 42 |
-i "${S}/hip-config.cmake.in" || die |
| 43 |
|
| 44 |
einfo "prefixing hipcc and its utils..." |
| 45 |
- hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}") |
| 46 |
- hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${HIP_S}") |
| 47 |
+ hprefixify $(grep -rl --exclude-dir=build/ --exclude="hip-config.cmake.in" "/usr" "${S}") |
| 48 |
+ hprefixify $(grep -rl --exclude-dir=build/ --exclude="hipcc.pl" "/usr" "${HIP_S}") |
| 49 |
|
| 50 |
cp "$(prefixify_ro "${FILESDIR}"/hipvars-5.1.3.pm)" bin/hipvars.pm || die "failed to replace hipvars.pm" |
| 51 |
sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \ |
| 52 |
|
| 53 |
diff --git a/dev-util/hip/hip-5.3.3-r1.ebuild b/dev-util/hip/hip-5.3.3-r2.ebuild |
| 54 |
similarity index 93% |
| 55 |
rename from dev-util/hip/hip-5.3.3-r1.ebuild |
| 56 |
rename to dev-util/hip/hip-5.3.3-r2.ebuild |
| 57 |
index 07b7709afbc2..bf43460c20d0 100644 |
| 58 |
--- a/dev-util/hip/hip-5.3.3-r1.ebuild |
| 59 |
+++ b/dev-util/hip/hip-5.3.3-r2.ebuild |
| 60 |
@@ -97,19 +97,19 @@ src_prepare() { |
| 61 |
# which makes "stdlib.h" not found when using "#include_next" in header files; |
| 62 |
sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \ |
| 63 |
-e "/HIP.*FLAGS.*isystem.*HIP_INCLUDE_PATH/d" \ |
| 64 |
- -e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \ |
| 65 |
- -e "s:\$ENV{'HIP_LIB_PATH'}:'/usr/$(get_libdir)':" \ |
| 66 |
+ -e "s:\$ENV{'DEVICE_LIB_PATH'}:'${EPREFIX}/usr/lib/amdgcn/bitcode':" \ |
| 67 |
+ -e "s:\$ENV{'HIP_LIB_PATH'}:'${EPREFIX}/usr/$(get_libdir)':" \ |
| 68 |
-e "/rpath/s,--rpath=[^ ]*,," \ |
| 69 |
-e "s,\$HIP_CLANG_PATH/../lib/clang/\$HIP_CLANG_VERSION/,${CLANG_RESOURCE_DIR}/,g" \ |
| 70 |
-i bin/hipcc.pl || die |
| 71 |
|
| 72 |
# change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs" |
| 73 |
- sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \ |
| 74 |
+ sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:${EPREFIX}/usr/lib/amdgcn/bitcode:" \ |
| 75 |
-i "${S}/hip-config.cmake.in" || die |
| 76 |
|
| 77 |
einfo "prefixing hipcc and its utils..." |
| 78 |
- hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}") |
| 79 |
- hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${HIP_S}") |
| 80 |
+ hprefixify $(grep -rl --exclude-dir=build/ --exclude="hip-config.cmake.in" "/usr" "${S}") |
| 81 |
+ hprefixify $(grep -rl --exclude-dir=build/ --exclude="hipcc.pl" "/usr" "${HIP_S}") |
| 82 |
|
| 83 |
cp "$(prefixify_ro "${FILESDIR}"/hipvars-5.1.3.pm)" bin/hipvars.pm || die "failed to replace hipvars.pm" |
| 84 |
sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \ |
Archives