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 269EA158013 for ; Thu, 14 Dec 2023 15:02:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0C412BC02B; Thu, 14 Dec 2023 15:02:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 9830C2BC02A for ; Thu, 14 Dec 2023 15:02:23 +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 CB6F833E690 for ; Thu, 14 Dec 2023 15:02:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 282B91450 for ; Thu, 14 Dec 2023 15:02:21 +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: <1702566119.bceba55c72407a9669165f0be9985e54d3a8f0a6.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.7.1-r1.ebuild X-VCS-Directories: dev-util/hip/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: bceba55c72407a9669165f0be9985e54d3a8f0a6 X-VCS-Branch: master Date: Thu, 14 Dec 2023 15:02:21 +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: f26584ab-4144-4448-a9a0-0058dee508f7 X-Archives-Hash: ba6de7ba713736e6393dfb71b52d7384 commit: bceba55c72407a9669165f0be9985e54d3a8f0a6 Author: Benda Xu gentoo org> AuthorDate: Mon Nov 20 02:56:38 2023 +0000 Commit: Benda XU gentoo org> CommitDate: Thu Dec 14 15:01:59 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bceba55c dev-util/hip: get rid of FindHIP and keep hip-config. According to the cmake documentation, do not write find modules for packages that themselves build with CMake. Instead provide a CMake package configuration file with the package itself. FindHIP is needed by HIP over CUDA, not what Gentoo is aiming for. Reference: https://github.com/ROCmSoftwarePlatform/hipFFT/pull/66 Reference: https://cmake.org/cmake/help/latest/command/find_package.html Bug: https://github.com/ROCm-Developer-Tools/hipamd/issues/39 Signed-off-by: Benda Xu gentoo.org> dev-util/hip/hip-5.7.1-r1.ebuild | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dev-util/hip/hip-5.7.1-r1.ebuild b/dev-util/hip/hip-5.7.1-r1.ebuild index 2bc703093df9..25601091075f 100644 --- a/dev-util/hip/hip-5.7.1-r1.ebuild +++ b/dev-util/hip/hip-5.7.1-r1.ebuild @@ -59,6 +59,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 + # https://github.com/ROCm-Developer-Tools/HIP/commit/405d029422ba8bb6be5a233d5eebedd2ad2e8bd3 # https://github.com/ROCm-Developer-Tools/clr/commit/ab6d34ae773f4d151e04170c0f4e46c1135ddf3e # Migrated to hip-test, but somehow the change is not applied to the tarball.