From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 finch.gentoo.org (Postfix) with ESMTPS id F05DA1582EF for ; Wed, 26 Feb 2025 09:02:15 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id DA2E234300A for ; Wed, 26 Feb 2025 09:02:15 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id D87BC1103AC; Wed, 26 Feb 2025 09:02:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 bobolink.gentoo.org (Postfix) with ESMTPS id CE4EE1103AC for ; Wed, 26 Feb 2025 09:02:14 +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 829D6342F9E for ; Wed, 26 Feb 2025 09:02:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B8DF2735 for ; Wed, 26 Feb 2025 09:02:13 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1740560516.e6353f8a6090b958d49652dd725840c3c285cc1b.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocm-comgr/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-Find-CLANG_RESOURCE_DIR.patch X-VCS-Directories: dev-libs/rocm-comgr/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: e6353f8a6090b958d49652dd725840c3c285cc1b X-VCS-Branch: master Date: Wed, 26 Feb 2025 09:02: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: 22e21cf4-1f62-4349-b0ce-52233d8320cd X-Archives-Hash: 0ce06979c13de2f9a8e9c50a7d95ed35 commit: e6353f8a6090b958d49652dd725840c3c285cc1b Author: Michael Mair-Keimberger levelnine at> AuthorDate: Tue Feb 25 07:05:59 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Feb 26 09:01:56 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6353f8a dev-libs/rocm-comgr: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Ionen Wolkens gentoo.org> .../rocm-comgr-5.1.3-Find-CLANG_RESOURCE_DIR.patch | 71 ---------------------- 1 file changed, 71 deletions(-) diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-Find-CLANG_RESOURCE_DIR.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-Find-CLANG_RESOURCE_DIR.patch deleted file mode 100644 index 362f5fcf16ca..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-Find-CLANG_RESOURCE_DIR.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 4c01c63a49af5748a8ee698553aa107803b60362 Mon Sep 17 00:00:00 2001 -From: Yiyang Wu -Date: Tue, 14 Jun 2022 20:21:22 +0800 -Subject: [PATCH] Find CLANG_RESOURCE_DIR using clang -print-resource-dir - -Suggested-By: https://reviews.llvm.org/D49486 -Signed-off-by: Yiyang Wu ---- - lib/comgr/cmake/opencl_pch.cmake | 24 +++--------------------- - 1 file changed, 3 insertions(+), 21 deletions(-) - -Index: comgr/cmake/opencl_pch.cmake -=================================================================== ---- comgr.orig/cmake/opencl_pch.cmake -+++ comgr/cmake/opencl_pch.cmake -@@ -1,26 +1,8 @@ - if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - find_package(Clang REQUIRED CONFIG) -- -- # FIXME: CLANG_CMAKE_DIR seems like the most stable way to find this, but -- # really there is no way to reliably discover this header. -- # -- # We effectively back up to the Clang output directory (for the case of a build -- # tree) or install prefix (for the case of an installed copy), and then search -- # for a file named opencl-c.h anywhere below that. We take the first result in -- # the case where there are multiple (e.g. if there is an installed copy nested -- # in a build directory). This is a bit imprecise, but it covers cases like MSVC -- # adding some additional configuration-specific subdirectories to the build -- # tree but not to an installed copy. -- file(GLOB_RECURSE OPENCL_C_H_LIST "${CLANG_CMAKE_DIR}/../../../*/opencl-c.h") -- -- list(GET OPENCL_C_H_LIST 0 OPENCL_C_H) -- -- if (NOT EXISTS "${OPENCL_C_H}" OR IS_DIRECTORY "${OPENCL_C_H}") -- message(FATAL_ERROR "Unable to locate opencl-c.h from the supplied Clang. The path '${CLANG_CMAKE_DIR}/../../../*' was searched.") -- endif() --else() -- get_target_property(clang_build_header_dir clang-resource-headers RUNTIME_OUTPUT_DIRECTORY) -- set(OPENCL_C_H "${clang_build_header_dir}/opencl-c.h") -+ execute_process(COMMAND "${CLANG_INSTALL_PREFIX}/bin/clang" -print-resource-dir OUTPUT_VARIABLE CLANG_RESOURCE_DIR) -+ string(STRIP ${CLANG_RESOURCE_DIR} CLANG_RESOURCE_DIR) -+ set(OPENCL_C_H "${CLANG_RESOURCE_DIR}/include/opencl-c.h") - endif() - - # Macro to create and install a custom target for generating PCH for given -Index: comgr/src/comgr-compiler.cpp -=================================================================== ---- comgr.orig/src/comgr-compiler.cpp -+++ comgr/src/comgr-compiler.cpp -@@ -42,6 +42,7 @@ - #include "lld/Common/Driver.h" - #include "clang/Basic/Version.h" - #include "clang/CodeGen/CodeGenAction.h" -+#include "clang/Config/config.h" - #include "clang/Driver/Compilation.h" - #include "clang/Driver/DriverDiagnostic.h" - #include "clang/Driver/Job.h" -@@ -988,11 +989,8 @@ amd_comgr_status_t AMDGPUCompiler::addCo - HIPIncludePath = (Twine(env::getHIPPath()) + "/include").str(); - // HIP headers depend on hsa.h which is in ROCM_DIR/include. - ROCMIncludePath = (Twine(env::getROCMPath()) + "/include").str(); -- ClangIncludePath = -- (Twine(env::getLLVMPath()) + "/lib/clang/" + CLANG_VERSION_STRING).str(); -- ClangIncludePath2 = (Twine(env::getLLVMPath()) + "/lib/clang/" + -- CLANG_VERSION_STRING + "/include") -- .str(); -+ ClangIncludePath = (Twine(env::getLLVMPath()) + "/bin/" + CLANG_RESOURCE_DIR).str(); -+ ClangIncludePath2 = (Twine(env::getLLVMPath()) + "/bin/" + CLANG_RESOURCE_DIR + "/include").str(); - - Args.push_back("-x"); -