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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7182F15800F for ; Tue, 31 Jan 2023 13:32:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D259E0BE0; Tue, 31 Jan 2023 13:32:30 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 566D7E0BE0 for ; Tue, 31 Jan 2023 13:32:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7F1A2340DB7 for ; Tue, 31 Jan 2023 13:32:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 30AC8895 for ; Tue, 31 Jan 2023 13:32:27 +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: <1675171843.ccca3c9fb3f52a7d7a4fe8a2d3fcf70118520095.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-5.3.3-r2.ebuild X-VCS-Directories: dev-util/hip/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: ccca3c9fb3f52a7d7a4fe8a2d3fcf70118520095 X-VCS-Branch: master Date: Tue, 31 Jan 2023 13:32:27 +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: ec3aa811-9401-4f4d-8adc-a7e56926b564 X-Archives-Hash: 9e5aef695d9c81689a705df7d2ae8f6b commit: ccca3c9fb3f52a7d7a4fe8a2d3fcf70118520095 Author: Yiyang Wu gmail com> AuthorDate: Mon Jan 23 13:58:12 2023 +0000 Commit: Benda XU gentoo org> CommitDate: Tue Jan 31 13:30:43 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccca3c9f dev-util/hip: remove unnecessary sed commands Note: this turns __HIP_ENABLE_PCH to ON (it's turned off originally due to build failure back in version 4.0.0, but now the issue disappears) Signed-off-by: Yiyang Wu gmail.com> Signed-off-by: Benda Xu gentoo.org> dev-util/hip/hip-5.3.3-r2.ebuild | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dev-util/hip/hip-5.3.3-r2.ebuild b/dev-util/hip/hip-5.3.3-r2.ebuild index 210af33a2bb1..b842e9362711 100644 --- a/dev-util/hip/hip-5.3.3-r2.ebuild +++ b/dev-util/hip/hip-5.3.3-r2.ebuild @@ -71,22 +71,15 @@ src_prepare() { # 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 - # correctly find HIP_CLANG_INCLUDE_PATH using cmake local LLVM_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" local CLANG_RESOURCE_DIR=$("${LLVM_PREFIX}/bin/clang" -print-resource-dir) sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":${LLVM_PREFIX}:" -i hip-config.cmake.in || die # correct libs and cmake install dir - sed -e "/LIB_INSTALL_DIR/s:PREFIX}/lib:PREFIX}/$(get_libdir):" \ - -e "/\${HIP_COMMON_DIR}/s:cmake DESTINATION .):cmake/ DESTINATION share/cmake/Modules):" -i CMakeLists.txt || die - sed -e "/LIBRARY DESTINATION/s:lib:$(get_libdir):" -i src/CMakeLists.txt || die + sed -e "/\${HIP_COMMON_DIR}/s:cmake DESTINATION .):cmake/ DESTINATION share/cmake/Modules):" -i CMakeLists.txt || die sed -e "/\.hip/d" \ - -e "s,DESTINATION lib,DESTINATION $(get_libdir),g" \ - -e "/cmake DESTINATION/d" \ -e "/CPACK_RESOURCE_FILE_LICENSE/d" -i packaging/CMakeLists.txt || die pushd ${HIP_S} || die