[gentoo-commits] repo/gentoo:master commit in: dev-util/Tensile/files/, dev-util/Tensile/

[Sam James]

commit:     67229b0667ae0b9a3553b47cea1d8c9fd7056fa2
Author:     Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Wed Mar  6 17:45:11 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar  8 19:21:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67229b06

dev-util/Tensile: fix compilation of rocBLAS by propagating MSGPACK_NO_BOOST 
definition

Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...ile-5.7.1-r1.ebuild => Tensile-5.7.1-r2.ebuild} |  3 ++-
 .../Tensile-5.7.1-fix-msgpack-dependency.patch     | 29 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/dev-util/Tensile/Tensile-5.7.1-r1.ebuild 
b/dev-util/Tensile/Tensile-5.7.1-r2.ebuild
similarity index 97%
rename from dev-util/Tensile/Tensile-5.7.1-r1.ebuild
rename to dev-util/Tensile/Tensile-5.7.1-r2.ebuild
index 7534e358736f..94b4aac75b1b 100644
--- a/dev-util/Tensile/Tensile-5.7.1-r1.ebuild
+++ b/dev-util/Tensile/Tensile-5.7.1-r2.ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE="client? ( ${ROCM_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
+       client? ( dev-libs/boost )
        >=dev-cpp/msgpack-cxx-6.0.0
        dev-python/pyyaml[${PYTHON_USEDEP}]
        dev-python/msgpack[${PYTHON_USEDEP}]
@@ -43,11 +44,11 @@ BDEPEND="
 distutils_enable_tests pytest
 
 PATCHES=(
-       "${FILESDIR}"/${PN}-change-cmake-name-for-msgpack-cxx-6-release.patch
        "${FILESDIR}"/${PN}-4.3.0-output-commands.patch
        "${FILESDIR}"/${PN}-5.4.2-fix-arch-parse.patch
        "${FILESDIR}"/${PN}-5.4.2-use-ninja.patch
        "${FILESDIR}"/${PN}-5.7.1-expand-isa-compatibility.patch
+       "${FILESDIR}"/${PN}-5.7.1-fix-msgpack-dependency.patch
 )
 
 CMAKE_USE_DIR="${S}/${PN}/Source"

diff --git a/dev-util/Tensile/files/Tensile-5.7.1-fix-msgpack-dependency.patch 
b/dev-util/Tensile/files/Tensile-5.7.1-fix-msgpack-dependency.patch
new file mode 100644
index 000000000000..f6f3f0e24c1a
--- /dev/null
+++ b/dev-util/Tensile/files/Tensile-5.7.1-fix-msgpack-dependency.patch
@@ -0,0 +1,29 @@
+Gentoo uses "msgpack-cxx" as library name and adds important
+MSGPACK_NO_BOOST compile definition when msgpack-cxx us installed with 
USE=-boost
+--- a/Tensile/Source/lib/CMakeLists.txt
++++ b/Tensile/Source/lib/CMakeLists.txt
+@@ -98,22 +98,9 @@ if(TENSILE_USE_LLVM OR TENSILE_USE_MSGPACK)
+ endif()
+ 
+ if(TENSILE_USE_MSGPACK)
+-    find_package(msgpack REQUIRED)
++    find_package(msgpack-cxx REQUIRED)
+     target_compile_definitions(TensileHost PUBLIC -DTENSILE_MSGPACK=1)
+-
+-    if(TARGET msgpackc-cxx)
+-        get_target_property(msgpack_inc msgpackc-cxx 
INTERFACE_INCLUDE_DIRECTORIES)
+-    elseif(TARGET msgpackc)
+-        get_target_property(msgpack_inc msgpackc 
INTERFACE_INCLUDE_DIRECTORIES)
+-    endif()
+-
+-    if(DEFINED msgpack_inc)
+-        # include C++ headers manually
+-        # External header includes included as system files
+-        target_include_directories(TensileHost 
+-            SYSTEM PRIVATE $<BUILD_INTERFACE:${msgpack_inc}>
+-        )
+-    endif()
++    target_link_libraries(TensileHost PRIVATE msgpack-cxx)
+ endif()
+ 
+ if(TENSILE_USE_LLVM)