From b50f921868baa4dddce4cd2fe711855e032248ae Mon Sep 17 00:00:00 2001
From: Patrick Lauer <patrick@gentoo.org>
Date: Sun, 9 Nov 2025 14:56:35 +0000
Subject: [PATCH] dev-util/Tensile: Fix build with USE=client

Closes: https://bugs.gentoo.org/965842
Signed-off-by: Patrick Lauer <patrick@gentoo.org>
---
 .../{Tensile-7.1.0.ebuild => Tensile-7.1.0-r1.ebuild}  |  4 +++-
 dev-util/Tensile/files/Tensile-7.1.0-cmake.patch       | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 rename dev-util/Tensile/{Tensile-7.1.0.ebuild => Tensile-7.1.0-r1.ebuild} (97%)
 create mode 100644 dev-util/Tensile/files/Tensile-7.1.0-cmake.patch

diff --git a/dev-util/Tensile/Tensile-7.1.0.ebuild b/dev-util/Tensile/Tensile-7.1.0-r1.ebuild
similarity index 97%
rename from dev-util/Tensile/Tensile-7.1.0.ebuild
rename to dev-util/Tensile/Tensile-7.1.0-r1.ebuild
index 5ddfc216d6b19..45167f6664ed0 100644
--- a/dev-util/Tensile/Tensile-7.1.0.ebuild
+++ b/dev-util/Tensile/Tensile-7.1.0-r1.ebuild
@@ -61,6 +61,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.4.2-fix-arch-parse.patch
 	"${FILESDIR}"/${PN}-6.0.2-expand-isa-compatibility.patch
 	"${FILESDIR}"/${PN}-7.0.1-fix-install.patch
+	"${FILESDIR}"/${PN}-7.1.0-cmake.patch
 )
 
 CMAKE_USE_DIR="${S}/${PN}/Source"
@@ -106,12 +107,13 @@ src_configure() {
 
 	distutils-r1_src_configure
 	if use client; then
+		local targets="$(get_amdgpu_flags)"
 		local mycmakeargs=(
 			-DCMAKE_SKIP_RPATH=ON
 			-DTENSILE_USE_MSGPACK=ON
 			-DTENSILE_USE_LLVM=ON
 			-DTensile_LIBRARY_FORMAT=msgpack
-			-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+			-DGPU_TARGETS="${targets::-1}"
 		)
 		cmake_src_configure
 	fi
diff --git a/dev-util/Tensile/files/Tensile-7.1.0-cmake.patch b/dev-util/Tensile/files/Tensile-7.1.0-cmake.patch
new file mode 100644
index 0000000000000..71557327fb670
--- /dev/null
+++ b/dev-util/Tensile/files/Tensile-7.1.0-cmake.patch
@@ -0,0 +1,10 @@
+--- a/Tensile/Source/CMakeLists.txt	2025-11-09 14:45:24.206159874 -0000
++++ b/Tensile/Source/CMakeLists.txt	2025-11-09 14:47:23.555541567 -0000
+@@ -50,6 +50,7 @@
+     endif()
+ endif()
+ 
++list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+ include(TensileSupportedArchitectures)
+ set(GPU_TARGETS "" CACHE STRING "AMD GFX targets to cross-compile")
+