commit: 81aebd088f646095930f961c38fae6a769c21328 Author: Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com> AuthorDate: Sat Feb 11 09:14:03 2023 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Fri Feb 24 16:49:47 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81aebd08
dev-util/Tensile: support >=dev-cpp/msgpack-cxx-5.0.0 Closes: https://bugs.gentoo.org/893544 Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com> Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> dev-util/Tensile/Tensile-5.1.3-r1.ebuild | 9 ++++---- dev-util/Tensile/Tensile-5.4.2.ebuild | 9 ++++---- ...1-Change-cmake-name-for-msgpack-5-release.patch | 25 ++++++++++++++++++++++ 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dev-util/Tensile/Tensile-5.1.3-r1.ebuild b/dev-util/Tensile/Tensile-5.1.3-r1.ebuild index 3105b82b83a7..2f487059341f 100644 --- a/dev-util/Tensile/Tensile-5.1.3-r1.ebuild +++ b/dev-util/Tensile/Tensile-5.1.3-r1.ebuild @@ -23,19 +23,20 @@ SLOT="0/$(ver_cut 1-2)" RESTRICT="test" RDEPEND="${PYTHON_DEPS} - sys-devel/clang:${LLVM_MAX_SLOT} + dev-cpp/msgpack-cxx dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/msgpack[${PYTHON_USEDEP}] - >=dev-util/rocm-smi-4.3.0 -" -DEPEND="${RDEPEND} dev-util/hip + sys-devel/clang:${LLVM_MAX_SLOT} + >=dev-util/rocm-smi-4.3.0 " +DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${PN}-4.3.0-output-commands.patch "${FILESDIR}"/${PN}-5.0.2-gfx1031.patch "${FILESDIR}"/${PN}-5.0.2-fix-arch-parse.patch "${FILESDIR}"/${PN}-5.0.2-use-ninja.patch + "${FILESDIR}"/0001-Change-cmake-name-for-msgpack-5-release.patch ) CMAKE_USE_DIR="${WORKDIR}/Source" diff --git a/dev-util/Tensile/Tensile-5.4.2.ebuild b/dev-util/Tensile/Tensile-5.4.2.ebuild index 1e347fdcee56..9a12444e7abf 100644 --- a/dev-util/Tensile/Tensile-5.4.2.ebuild +++ b/dev-util/Tensile/Tensile-5.4.2.ebuild @@ -22,19 +22,20 @@ SLOT="0/$(ver_cut 1-2)" RESTRICT="test" RDEPEND="${PYTHON_DEPS} - sys-devel/clang:${LLVM_MAX_SLOT} + dev-cpp/msgpack-cxx dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/msgpack[${PYTHON_USEDEP}] - >=dev-util/rocm-smi-4.3.0 -" -DEPEND="${RDEPEND} dev-util/hip + >=dev-util/rocm-smi-4.3.0 + sys-devel/clang:${LLVM_MAX_SLOT} " +DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${PN}-4.3.0-output-commands.patch "${FILESDIR}"/${PN}-5.4.2-gfx1031.patch "${FILESDIR}"/${PN}-5.4.2-fix-arch-parse.patch "${FILESDIR}"/${PN}-5.4.2-use-ninja.patch + "${FILESDIR}"/0001-Change-cmake-name-for-msgpack-5-release.patch ) CMAKE_USE_DIR="${WORKDIR}/Source" diff --git a/dev-util/Tensile/files/0001-Change-cmake-name-for-msgpack-5-release.patch b/dev-util/Tensile/files/0001-Change-cmake-name-for-msgpack-5-release.patch new file mode 100644 index 000000000000..7f8fb95123ee --- /dev/null +++ b/dev-util/Tensile/files/0001-Change-cmake-name-for-msgpack-5-release.patch @@ -0,0 +1,25 @@ +From 66f5f943bbd0fd3b41b02ce7a563bed9f59f9c38 Mon Sep 17 00:00:00 2001 +From: Yiyang Wu <[email protected]> +Date: Sat, 11 Feb 2023 15:37:11 +0800 +Subject: [PATCH] Change cmake name for msgpack-5 release + +--- + Tensile/Source/lib/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Tensile/Source/lib/CMakeLists.txt b/Tensile/Source/lib/CMakeLists.txt +index 47a5d15d..f1a6118b 100644 +--- a/Tensile/Source/lib/CMakeLists.txt ++++ b/Tensile/Source/lib/CMakeLists.txt +@@ -97,7 +97,7 @@ if(TENSILE_USE_LLVM OR TENSILE_USE_MSGPACK) + endif() + + if(TENSILE_USE_MSGPACK) +- find_package(msgpack REQUIRED) ++ find_package(msgpackc-cxx REQUIRED) + target_compile_definitions(TensileHost PUBLIC -DTENSILE_MSGPACK=1) + + if(TARGET msgpackc-cxx) +-- +2.39.1 +
