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 2CD28158041 for ; Fri, 8 Mar 2024 19:22:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8C66DE29DB; Fri, 8 Mar 2024 19:22:55 +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 731AEE29DB for ; Fri, 8 Mar 2024 19:22:55 +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 B348033BEEE for ; Fri, 8 Mar 2024 19:22:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1904314FA for ; Fri, 8 Mar 2024 19:22:52 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1709925724.5223e983a0810e46633362ff4dbad6a194208819.sam@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.7.1-r1.ebuild dev-util/hip/hip-5.7.1-r2.ebuild X-VCS-Directories: dev-util/hip/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5223e983a0810e46633362ff4dbad6a194208819 X-VCS-Branch: master Date: Fri, 8 Mar 2024 19:22:52 +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: 0388e416-ed6b-473b-b836-673b279aa785 X-Archives-Hash: 4a27a0207b1e4f3edeada7c7a62b3e76 commit: 5223e983a0810e46633362ff4dbad6a194208819 Author: Sv. Lockal gmail com> AuthorDate: Wed Jan 10 20:54:05 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri Mar 8 19:22:04 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5223e983 dev-util/hip: install FindHIP.cmake: it contains hip_add_executable and other functions, required in rocTracer, pytorch, etc. Signed-off-by: Sv. Lockal gmail.com> Signed-off-by: Sam James gentoo.org> dev-util/hip/{hip-5.7.1-r1.ebuild => hip-5.7.1-r2.ebuild} | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dev-util/hip/hip-5.7.1-r1.ebuild b/dev-util/hip/hip-5.7.1-r2.ebuild similarity index 92% rename from dev-util/hip/hip-5.7.1-r1.ebuild rename to dev-util/hip/hip-5.7.1-r2.ebuild index 7b1a593f23e5..a2ec876aaf25 100644 --- a/dev-util/hip/hip-5.7.1-r1.ebuild +++ b/dev-util/hip/hip-5.7.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -60,9 +60,10 @@ hip_test_wrapper() { } src_prepare() { - # hipamd is itself built by cmake, and should never provide a - # FindHIP.cmake module. - rm -r "${WORKDIR}"/HIP-rocm-${PV}/cmake/FindHIP* || die + # Set HIP and HIP Clang paths directly, don't search using heuristics + sed -e "s:# Search for HIP installation:set(HIP_ROOT_DIR \"${EPREFIX}/usr\"):" \ + -e "s:#Set HIP_CLANG_PATH:set(HIP_CLANG_PATH \"$(get_llvm_prefix -d ${LLVM_MAX_SLOT})/bin\"):" \ + -i "${WORKDIR}"/HIP-rocm-${PV}/cmake/FindHIP.cmake || die # https://github.com/ROCm-Developer-Tools/HIP/commit/405d029422ba8bb6be5a233d5eebedd2ad2e8bd3 # https://github.com/ROCm-Developer-Tools/clr/commit/ab6d34ae773f4d151e04170c0f4e46c1135ddf3e