diff options
author | V3n3RiX <venerix@koprulu.sector> | 2025-02-26 19:26:07 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2025-02-26 19:26:07 +0000 |
commit | acfd7c956a7b45da7af1452ec12e0b2d5e6ac65b (patch) | |
tree | 13151a7440c2560b01e3cf5bd56ad280482b88bf /dev-libs/rocm-comgr | |
parent | 67dbd3ba144944fbf4b466be1b5fa0569b774e6f (diff) |
gentoo auto-resync : 26:02:2025 - 19:26:07
Diffstat (limited to 'dev-libs/rocm-comgr')
-rw-r--r-- | dev-libs/rocm-comgr/Manifest | 1 | ||||
-rw-r--r-- | dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-Find-CLANG_RESOURCE_DIR.patch | 71 |
2 files changed, 0 insertions, 72 deletions
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest index c86095976c1e..d4a75e22b90b 100644 --- a/dev-libs/rocm-comgr/Manifest +++ b/dev-libs/rocm-comgr/Manifest @@ -1,7 +1,6 @@ AUX 0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch 2249 BLAKE2B 50208a5f2bed91d52eeec4f192cae5fe57d5f43221dd6333ed8e95ac3e0047588952ab2ca2188d4b401354032ddfa24b83a0e8e8e416748249001910abd2ef55 SHA512 cc9a3cab03d0d7c930b667bc61ba0404448d4ac1c3adf708c994c8e0f9d49232edc3beb1209ebe72990e97793f7b34ae4c9f68745343e07f6fa873989c12a14d AUX 0001-Specify-clang-exe-path-in-Driver-Creation.patch 2098 BLAKE2B 0bb6902e322ba6354f5cf31b6b7b842d0db43a1f14293edf228c31bb299a336267c573f5ddbc2bacb0525468625b98b260cc81d1cdd7fa43cdf6e484404b3f5b SHA512 26bce5f9fbd964774945e1b056985aead0a9dedb0c85256eb7b9556f5a196cff9aae6441afc9a6f4fe3e7f7178ce4f6032fa7c3b9c7b4dcdacf1d26c0011195c AUX rocm-comgr-5.0-rocm_path.patch 419 BLAKE2B 2adfe03cd86d84b1f183689e5feff298860c22b12a87bddf357d746d96f2e4df3de3d01962138e02b7670b28a7884d4b16fe9f52f937a22caf931e74bd46de21 SHA512 1ca24101e3c296127a7b429f0f6b05bbff388a0db2d4ffc3003844353ca43ddf0d95c4f13c902b841d748c19cfa11c39a300786af04919da3919b8aa7724fc1a -AUX rocm-comgr-5.1.3-Find-CLANG_RESOURCE_DIR.patch 3434 BLAKE2B d5841e32974bb8750ff7d9d32256c13823b26a7d200c603162c66b04dc55ae0e5ee795a449f2e6f35a2bd2efddb5c67b03499d2aa4e441fbe54a5f8178e167a5 SHA512 d0da78fbbbdc9ee3bb4f0d4f98b2321913f9ad197edd1c0128c4785d14134646a5f8b9a1b75e268111dcb4dff872c0b8db398b475fa8b28c83324ae5801bd279 AUX rocm-comgr-5.1.3-rocm-path.patch 422 BLAKE2B 23200a9ead9cefe1af9b553da7448d93b1c7d0db7aa02a2dae0fa0b70b44b75056fe720fea8919c5315c5804289c30d6b476e43aa7aeaf25cc5c2430431f7a9a SHA512 6d1d2cfac7f2b70409e8cc3cb1556f516f495c4a217e85408fbd99587697912d82fc6a8745c37d2fe392ddbd0e8503489c353f26b3fbc6bce640c567f4230e89 AUX rocm-comgr-5.7.0-disassembly.patch 656 BLAKE2B b1ac5227b7b4d7a25cc5674ca185075e22dc91eb2e64ea1598fae03915a22153cfdafee4c34afc34e7490515bbdb09d49ba290d4544c617f23427d04296181ac SHA512 647a0a613786df7907616af43397ba9b16a80a7f6e7420ac41be7cc424a94df7f3248875bcb336e13de0f2ae13832362c6cbc42356703b655efc58cc4d6e4b6d AUX rocm-comgr-5.7.0-lld.patch 1355 BLAKE2B 565e3052974b99ee5050fc1b64d5f3b337866cf21a5d37fa37888e6257cf00b1718a0d3933b3f0e4e27caca4537652824c1ce01a8600852da503eead94a12d8f SHA512 35e6b2c8ad97d3dd5a870ed5c547c3727cd384c773371fa9608e29f7d525252f34fb784798c82c2071098667fd69ca4b89dfee20a8bf28b73b14bd13b4b00a50 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 <xgreenlandforwyy@gmail.com> -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 <xgreenlandforwyy@gmail.com> ---- - 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"); - |