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 43A9F139368 for ; Tue, 3 Aug 2021 01:35:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F905E0878; Tue, 3 Aug 2021 01:35:09 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 B5ACEE0878 for ; Tue, 3 Aug 2021 01:35:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 80FCA343BB3 for ; Tue, 3 Aug 2021 01:35:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E45277A7 for ; Tue, 3 Aug 2021 01:35:05 +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: <1627954500.2777139222b8f33993bcdb2947f3de5e9cc13901.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.ebuild X-VCS-Directories: dev-util/hip/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 2777139222b8f33993bcdb2947f3de5e9cc13901 X-VCS-Branch: master Date: Tue, 3 Aug 2021 01:35:05 +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: 9cd7048a-b129-4249-b622-b391a6ed4d04 X-Archives-Hash: c0861ae097d6d817a9200755adc29dfa commit: 2777139222b8f33993bcdb2947f3de5e9cc13901 Author: YiyangWu gmail com> AuthorDate: Sun Jul 25 06:01:49 2021 +0000 Commit: Benda XU gentoo org> CommitDate: Tue Aug 3 01:35:00 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27771392 dev-util/hip: cleanup unnecessary patches and sed commands. hip uses HIP_PLATFORM=amd and HIP_RUNTIME=amd, therefore some sed commands are not necessary anymore. Every patch is checked. Removing hip-3.5.1-hip_vector_types.patch seems to have no impact on compile and running hipcc. Closes: https://github.com/gentoo/gentoo/pull/21863 Bug: https://github.com/justxi/rocm/issues/192 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Yiyang Wu gmail.com> Signed-off-by: Benda Xu gentoo.org> dev-util/hip/hip-4.1.0.ebuild | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dev-util/hip/hip-4.1.0.ebuild b/dev-util/hip/hip-4.1.0.ebuild index e6e6a374a78..c5b5027b241 100644 --- a/dev-util/hip/hip-4.1.0.ebuild +++ b/dev-util/hip/hip-4.1.0.ebuild @@ -26,7 +26,6 @@ PATCHES=( "${FILESDIR}/${PN}-4.1.0-DisableTest.patch" "${FILESDIR}/${PN}-3.9.0-add-include-directories.patch" "${FILESDIR}/${PN}-3.5.1-config-cmake-in.patch" - "${FILESDIR}/${PN}-3.5.1-hip_vector_types.patch" "${FILESDIR}/${PN}-3.9.0-lpl_ca-add-include.patch" ) @@ -40,19 +39,15 @@ src_prepare() { sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${PVR})" -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 "${S}/CMakeLists.txt" || die + sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i CMakeLists.txt || die # "hcc" is deprecated and not installed, new platform is "rocclr"; # Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include" # which makes "stdlib.h" not found when using "#include_next" in header files; - sed -e "/HIP_PLATFORM.*HIP_COMPILER.*clang/s:hcc:rocclr:" \ - -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \ + sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \ -e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \ -i bin/hipcc || die - # replace hcc remnants with modern rocclr. - sed -e "/HIP_PLATFORM.*STREQUAL/s:hcc:rocclr:" -i cmake/FindHIP/run_hipcc.cmake || die - # correctly find HIP_CLANG_INCLUDE_PATH using cmake sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":/usr/lib/llvm/roc:" -i hip-config.cmake.in || die