commit: 3107cc70d2cb873fd92cfb7a0845dd45b29e3aef Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Fri Oct 17 09:27:44 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Oct 17 14:31:24 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3107cc70
dev-libs/roct-thunk-interface: drop unused patches Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44218 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/kfdtest-6.1.0-libpath.patch | 13 ----- .../files/kfdtest-6.1.0-linklibLLVM.patch | 31 ----------- .../roct-thunk-interface-5.7.0-functions.patch | 14 ----- .../files/roct-thunk-interface-5.7.1-musl.patch | 61 ---------------------- .../roct-thunk-interface-6.1.0-visibility.patch | 26 --------- 5 files changed, 145 deletions(-) diff --git a/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-libpath.patch b/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-libpath.patch deleted file mode 100644 index 1d7d73ad7a8a..000000000000 --- a/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-libpath.patch +++ /dev/null @@ -1,13 +0,0 @@ -The built hsakmt library is right under BUILD_DIR, not BUILD_DIR/lib -=================================================================== ---- a/tests/kfdtest/CMakeLists.txt -+++ b./tests/kfdtest/CMakeLists.txt -@@ -117,7 +117,7 @@ else() - endif() - - if( DEFINED LIBHSAKMT_PATH ) -- set ( HSAKMT_LIBRARY_DIRS ${LIBHSAKMT_PATH}/lib ) -+ set ( HSAKMT_LIBRARY_DIRS ${LIBHSAKMT_PATH}/ ) - set ( HSAKMT_LIBRARIES hsakmt ) - endif() - diff --git a/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-linklibLLVM.patch b/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-linklibLLVM.patch deleted file mode 100644 index 61d8b99bf335..000000000000 --- a/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-linklibLLVM.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://github.com/ROCm/ROCT-Thunk-Interface/pull/102 -From 6d7d48bb6843405aac2777388edf4c7c2a6f9dc3 Mon Sep 17 00:00:00 2001 -From: Yiyang Wu <[email protected]> -Date: Tue, 30 Apr 2024 13:35:08 +0800 -Subject: [PATCH] Allow linking libLLVM dynamic library rather than separate - components - ---- - tests/kfdtest/CMakeLists.txt | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/tests/kfdtest/CMakeLists.txt b/tests/kfdtest/CMakeLists.txt -index 9d1172e..ccad7f4 100644 ---- a/tests/kfdtest/CMakeLists.txt -+++ b/tests/kfdtest/CMakeLists.txt -@@ -154,7 +154,11 @@ include_directories(${LLVM_INCLUDE_DIRS}) - separate_arguments(LLVM_DEFINITIONS_LIST NATIVE_COMMAND ${LLVM_DEFINITIONS}) - add_definitions(${LLVM_DEFINITIONS_LIST}) - --llvm_map_components_to_libnames(llvm_libs AMDGPUAsmParser Core Support) -+if (LLVM_LINK_LLVM_DYLIB) -+ set(llvm_libs LLVM) -+else() -+ llvm_map_components_to_libnames(llvm_libs AMDGPUAsmParser Core Support) -+endif() - - include_directories(${PROJECT_SOURCE_DIR}/gtest-1.6.0) - include_directories(${PROJECT_SOURCE_DIR}/include) --- -2.44.0 - diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-5.7.0-functions.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-5.7.0-functions.patch deleted file mode 100644 index 051beeeb1b2e..000000000000 --- a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-5.7.0-functions.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/libhsakmt.ver b/src/libhsakmt.ver -index dc17215..964f3d0 100644 ---- a/src/libhsakmt.ver -+++ b/src/libhsakmt.ver -@@ -75,6 +75,9 @@ hsaKmtSetXNACKMode; - hsaKmtGetXNACKMode; - hsaKmtOpenSMI; - hsaKmtExportDMABufHandle; -+hsaKmtWaitOnMultipleEvents_Ext; -+hsaKmtReplaceAsanHeaderPage; -+hsaKmtWaitOnEvent_Ext; - - local: *; - }; diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-5.7.1-musl.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-5.7.1-musl.patch deleted file mode 100644 index 8cd8a5ff2ee1..000000000000 --- a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-5.7.1-musl.patch +++ /dev/null @@ -1,61 +0,0 @@ -Upstream PR: https://github.com/ROCm/ROCT-Thunk-Interface/pull/96 -Bug: https://github.com/ROCm/ROCT-Thunk-Interface/issues/65 ---- a/src/globals.c -+++ b/src/globals.c -@@ -32,5 +32,9 @@ unsigned long kfd_open_count; - unsigned long system_properties_count; - pthread_mutex_t hsakmt_mutex = PTHREAD_MUTEX_INITIALIZER; - bool is_dgpu; -+ -+#ifndef PAGE_SIZE - int PAGE_SIZE; -+#endif -+ - int PAGE_SHIFT; ---- a/src/libhsakmt.h -+++ b/src/libhsakmt.h -@@ -62,7 +62,11 @@ extern HsaVersionInfo kfd_version_info; - do { if ((minor) > kfd_version_info.KernelInterfaceMinorVersion)\ - return HSAKMT_STATUS_NOT_SUPPORTED; } while (0) - -+/* Might be defined in limits.h on platforms where it is constant (used by musl) */ -+/* See also: https://pubs.opengroup.org/onlinepubs/7908799/xsh/limits.h.html */ -+#ifndef PAGE_SIZE - extern int PAGE_SIZE; -+#endif - extern int PAGE_SHIFT; - - /* VI HW bug requires this virtual address alignment */ ---- a/src/openclose.c -+++ b/src/openclose.c -@@ -116,7 +116,9 @@ static void clear_after_fork(void) - - static inline void init_page_size(void) - { -+#ifndef PAGE_SIZE - PAGE_SIZE = sysconf(_SC_PAGESIZE); -+#endif - PAGE_SHIFT = ffs(PAGE_SIZE) - 1; - } - ---- a/src/topology.c -+++ b/src/topology.c -@@ -32,6 +32,7 @@ - #include <string.h> - #include <unistd.h> - #include <ctype.h> -+#include <limits.h> - - #include <errno.h> - #include <sys/sysinfo.h> -@@ -1369,6 +1370,10 @@ static int topology_create_temp_cpu_cache_list(int node, - * which can be present twice in the string above. 29 is for the prefix - * and the +6 is for the cache suffix - */ -+#ifndef MAXNAMLEN -+/* MAXNAMLEN is the BSD name for NAME_MAX. glibc aliases this as NAME_MAX, but not musl */ -+#define MAXNAMLEN NAME_MAX -+#endif - const uint32_t MAXPATHSIZE = 29 + MAXNAMLEN + (MAXNAMLEN + 6); - cpu_cacheinfo_t *p_temp_cpu_ci_list; /* a list of cpu_ci */ - char path[MAXPATHSIZE], node_dir[MAXPATHSIZE]; diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.1.0-visibility.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.1.0-visibility.patch deleted file mode 100644 index d907d2f13e41..000000000000 --- a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.1.0-visibility.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/ROCm/ROCT-Thunk-Interface/pull/102 -From 8385d8795b994f31e00e651dc4f41e18d82ff968 Mon Sep 17 00:00:00 2001 -From: Yiyang Wu <[email protected]> -Date: Tue, 30 Apr 2024 15:07:12 +0800 -Subject: [PATCH] hsaKmtCheckRuntimeDebugSupport should be visible for kfdtest - ---- - src/debug.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/debug.c b/src/debug.c -index 932e829..67c32c8 100644 ---- a/src/debug.c -+++ b/src/debug.c -@@ -268,7 +268,7 @@ HSAKMT_STATUS HSAKMTAPI hsaKmtDbgAddressWatch(HSAuint32 NodeId, - #define HSA_RUNTIME_ENABLE_MAX_MAJOR 1 - #define HSA_RUNTIME_ENABLE_MIN_MINOR 13 - --HSAKMT_STATUS hsaKmtCheckRuntimeDebugSupport(void) { -+HSAKMT_STATUS HSAKMTAPI hsaKmtCheckRuntimeDebugSupport(void) { - HsaNodeProperties node = {0}; - HsaSystemProperties props = {0}; - HsaVersionInfo versionInfo = {0}; --- -2.44.0 -
