Gentoo Archives: gentoo-commits

From: Benda XU <heroxbd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/hip/
Date: Tue, 31 Jan 2023 13:32:31
Message-Id: 1675171843.ccca3c9fb3f52a7d7a4fe8a2d3fcf70118520095.heroxbd@gentoo
1 commit: ccca3c9fb3f52a7d7a4fe8a2d3fcf70118520095
2 Author: Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com>
3 AuthorDate: Mon Jan 23 13:58:12 2023 +0000
4 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 31 13:30:43 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccca3c9f
7
8 dev-util/hip: remove unnecessary sed commands
9
10 Note: this turns __HIP_ENABLE_PCH to ON (it's turned off originally due
11 to build failure back in version 4.0.0, but now the issue disappears)
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.3.3-r2.ebuild | 9 +--------
17 1 file changed, 1 insertion(+), 8 deletions(-)
18
19 diff --git a/dev-util/hip/hip-5.3.3-r2.ebuild b/dev-util/hip/hip-5.3.3-r2.ebuild
20 index 210af33a2bb1..b842e9362711 100644
21 --- a/dev-util/hip/hip-5.3.3-r2.ebuild
22 +++ b/dev-util/hip/hip-5.3.3-r2.ebuild
23 @@ -71,22 +71,15 @@ src_prepare() {
24 # Use Gentoo slot number, otherwise git hash is attempted in vain.
25 sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${SLOT#*/})" -i CMakeLists.txt || die
26
27 - # disable PCH, because it results in a build error in ROCm 4.0.0
28 - sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i CMakeLists.txt || die
29 -
30 # correctly find HIP_CLANG_INCLUDE_PATH using cmake
31 local LLVM_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
32 local CLANG_RESOURCE_DIR=$("${LLVM_PREFIX}/bin/clang" -print-resource-dir)
33 sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":${LLVM_PREFIX}:" -i hip-config.cmake.in || die
34
35 # correct libs and cmake install dir
36 - sed -e "/LIB_INSTALL_DIR/s:PREFIX}/lib:PREFIX}/$(get_libdir):" \
37 - -e "/\${HIP_COMMON_DIR}/s:cmake DESTINATION .):cmake/ DESTINATION share/cmake/Modules):" -i CMakeLists.txt || die
38 - sed -e "/LIBRARY DESTINATION/s:lib:$(get_libdir):" -i src/CMakeLists.txt || die
39 + sed -e "/\${HIP_COMMON_DIR}/s:cmake DESTINATION .):cmake/ DESTINATION share/cmake/Modules):" -i CMakeLists.txt || die
40
41 sed -e "/\.hip/d" \
42 - -e "s,DESTINATION lib,DESTINATION $(get_libdir),g" \
43 - -e "/cmake DESTINATION/d" \
44 -e "/CPACK_RESOURCE_FILE_LICENSE/d" -i packaging/CMakeLists.txt || die
45
46 pushd ${HIP_S} || die