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 47D9C1580C6 for ; Wed, 5 Apr 2023 16:10:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8516EE07D4; Wed, 5 Apr 2023 16:10:17 +0000 (UTC) Received: from smtp.gentoo.org (mail.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2616AE07D4 for ; Wed, 5 Apr 2023 16:10:16 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA27633BE62 for ; Wed, 5 Apr 2023 16:10:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 72A13A16 for ; Wed, 5 Apr 2023 16:10:13 +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: <1680710969.8039d6fb841d9bf4841574000b43c12ff9d30f37.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/hip/, dev-util/hip/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/hip/files/hip-5.4.3-fix-HIP_CLANG_PATH-detection.patch dev-util/hip/hip-5.3.3-r3.ebuild dev-util/hip/hip-5.4.3.ebuild X-VCS-Directories: dev-util/hip/files/ dev-util/hip/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 8039d6fb841d9bf4841574000b43c12ff9d30f37 X-VCS-Branch: master Date: Wed, 5 Apr 2023 16:10:13 +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: 9ffbc753-8f52-412f-94d9-ed194c7cc82a X-Archives-Hash: 1ea2acab4d51e6254cff250c24aa0ed2 commit: 8039d6fb841d9bf4841574000b43c12ff9d30f37 Author: Yiyang Wu gmail com> AuthorDate: Sun Mar 19 15:25:18 2023 +0000 Commit: Benda XU gentoo org> CommitDate: Wed Apr 5 16:09:29 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8039d6fb dev-util/hip: fix HIP_CLANG_PATH detection in FindHIP.cmake Signed-off-by: Yiyang Wu gmail.com> Signed-off-by: Benda Xu gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/29973 .../hip-5.4.3-fix-HIP_CLANG_PATH-detection.patch | 26 ++++++++++++++++++++++ dev-util/hip/hip-5.3.3-r3.ebuild | 1 + dev-util/hip/hip-5.4.3.ebuild | 1 + 3 files changed, 28 insertions(+) diff --git a/dev-util/hip/files/hip-5.4.3-fix-HIP_CLANG_PATH-detection.patch b/dev-util/hip/files/hip-5.4.3-fix-HIP_CLANG_PATH-detection.patch new file mode 100644 index 000000000000..28277d9d880c --- /dev/null +++ b/dev-util/hip/files/hip-5.4.3-fix-HIP_CLANG_PATH-detection.patch @@ -0,0 +1,26 @@ +From 03a7fd2937c146142fa95d22a0ee10df40442788 Mon Sep 17 00:00:00 2001 +From: Yiyang Wu +Date: Sun, 19 Mar 2023 22:32:01 +0800 +Subject: [PATCH] FindHIP.cmake: fix HIP_CLANG_PATH detection via + HIP_CLANG_INSTALL_DIR + +--- + cmake/FindHIP.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/FindHIP.cmake b/cmake/FindHIP.cmake +index 109c9f65..5dc4c632 100644 +--- a/cmake/FindHIP.cmake ++++ b/cmake/FindHIP.cmake +@@ -255,7 +255,7 @@ elseif("${HIP_COMPILER}" STREQUAL "clang") + if("x${HIP_CLANG_PATH}" STREQUAL "x") + # IF HIP_CLANG_INSTALL_DIR is Found + if( HIP_CLANG_INSTALL_DIR ) +- set(HIP_CLANG_PATH ${HIP_CLANG_INSTALL_DIR}) ++ set(HIP_CLANG_PATH "${HIP_CLANG_INSTALL_DIR}/bin") + else() # IF HIP_CLANG_INSTALL_DIR is not found + if(DEFINED ENV{HIP_CLANG_PATH}) + set(HIP_CLANG_PATH $ENV{HIP_CLANG_PATH}) +-- +2.40.0 + diff --git a/dev-util/hip/hip-5.3.3-r3.ebuild b/dev-util/hip/hip-5.3.3-r3.ebuild index e73675209ae1..c03da0d6effc 100644 --- a/dev-util/hip/hip-5.3.3-r3.ebuild +++ b/dev-util/hip/hip-5.3.3-r3.ebuild @@ -81,6 +81,7 @@ src_prepare() { eapply "${FILESDIR}/0001-SWDEV-344620-hipcc-fails-to-parse-version-of-clang-i.patch" eapply "${FILESDIR}/0002-SWDEV-355608-Remove-clang-include-path-2996.patch" eapply "${FILESDIR}/0003-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch" + eapply "${FILESDIR}/${PN}-5.4.3-fix-HIP_CLANG_PATH-detection.patch" # 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 "/FLAGS .= \" -isystem \$HSA_PATH/d" \ diff --git a/dev-util/hip/hip-5.4.3.ebuild b/dev-util/hip/hip-5.4.3.ebuild index 417b2b6c3290..7798aab3e444 100644 --- a/dev-util/hip/hip-5.4.3.ebuild +++ b/dev-util/hip/hip-5.4.3.ebuild @@ -81,6 +81,7 @@ src_prepare() { eapply "${FILESDIR}/${PN}-5.4.3-clang-version.patch" eapply "${FILESDIR}/${PN}-5.4.3-clang-include.patch" eapply "${FILESDIR}/0003-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch" + eapply "${FILESDIR}/${PN}-5.4.3-fix-HIP_CLANG_PATH-detection.patch" # Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include" # which makes "stdlib.h" not found when using "#include_next" in header files;