diff options
| author |   Sv. Lockal <lockalsash@gmail.com> | 2024-03-06 17:45:11 +0000 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2024-03-08 19:21:59 +0000 |
| commit | 67229b0667ae0b9a3553b47cea1d8c9fd7056fa2 (patch) | |
| tree | cea5d707213544d34b5c5d776a4d54bb9dffd4e4 /dev-util | |
| parent | dev-util/Tensile: lock dev-util/hip version, as with hip-6.0 build fails with... (diff) | |
| download | gentoo-67229b0667ae0b9a3553b47cea1d8c9fd7056fa2.tar.gz gentoo-67229b0667ae0b9a3553b47cea1d8c9fd7056fa2.tar.bz2 gentoo-67229b0667ae0b9a3553b47cea1d8c9fd7056fa2.zip | |
dev-util/Tensile: fix compilation of rocBLAS by propagating MSGPACK_NO_BOOST definition
Signed-off-by: Sv. Lockal <lockalsash@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/Tensile/Tensile-5.7.1-r2.ebuild (renamed from dev-util/Tensile/Tensile-5.7.1-r1.ebuild) | 3 | ||||
| -rw-r--r-- | dev-util/Tensile/files/Tensile-5.7.1-fix-msgpack-dependency.patch | 29 |
2 files changed, 31 insertions, 1 deletions
diff --git a/dev-util/Tensile/Tensile-5.7.1-r1.ebuild b/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) |