From 22c48cd7dccb5c69de56408c43d35a1a212c8f31 Mon Sep 17 00:00:00 2001 From: Yiyang Wu Date: Wed, 18 Jan 2023 21:38:04 +0800 Subject: [PATCH] dev-util/rocm-smi: update patch, LICENSE, PYTHON_COMPAT on 9999 Use newest patch from version 5.4.2 Clean up unnecessary sed commands like 5.4.2 Closes: https://bugs.gentoo.org/890646 Signed-off-by: Yiyang Wu Closes: https://github.com/gentoo/gentoo/pull/29157 Signed-off-by: Joonas Niilola --- dev-util/rocm-smi/rocm-smi-9999.ebuild | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dev-util/rocm-smi/rocm-smi-9999.ebuild b/dev-util/rocm-smi/rocm-smi-9999.ebuild index 8d35ce910b8be..bc4f8b8023715 100644 --- a/dev-util/rocm-smi/rocm-smi-9999.ebuild +++ b/dev-util/rocm-smi/rocm-smi-9999.ebuild @@ -3,9 +3,9 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) -inherit cmake multilib prefix python-r1 +inherit cmake python-r1 DESCRIPTION="ROCm System Management Interface Library" HOMEPAGE="https://github.com/RadeonOpenCompute/rocm_smi_lib" @@ -20,7 +20,7 @@ else S="${WORKDIR}/rocm_smi_lib-rocm-${PV}" fi -LICENSE="NCSA-AMD" +LICENSE="MIT NCSA-AMD" SLOT="0/$(ver_cut 1-2)" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -29,22 +29,23 @@ DEPEND="" RDEPEND="${PYTHON_DEPS}" BDEPEND="" +PATCHES=( + "${FILESDIR}"/${PN}-5.0.2-gcc12-memcpy.patch + "${FILESDIR}"/${PN}-5.4.2-detect-builtin-amdgpu.patch +) + src_prepare() { - sed -e "/DESTINATION/s,\${OAM_NAME}/lib,$(get_libdir)," \ - -e "/DESTINATION/s,oam/include/oam,include/oam," -i oam/CMakeLists.txt || die - sed -e "/link DESTINATION/,+1d" \ - -e "/DESTINATION/s,\${ROCM_SMI}/lib,$(get_libdir)," \ - -e "/bindings_link/,+3d" \ - -e "/rsmiBindings.py/,+1d" \ - -e "/DESTINATION/s,rocm_smi/include/rocm_smi,include/rocm_smi," -i rocm_smi/CMakeLists.txt || die - sed -e "/LICENSE.txt/d" -e "s,\${ROCM_SMI}/lib/cmake,$(get_libdir)/cmake,g" -i CMakeLists.txt || die - sed -e "/^path_librocm = /c\path_librocm = '${EPREFIX}/usr/lib64/librocm_smi64.so'" -i python_smi_tools/rsmiBindings.py || die + sed -e "/LICENSE.txt/d" -i CMakeLists.txt || die + sed -e "/^path_librocm = /c\path_librocm = '${EPREFIX}/usr/lib64/librocm_smi64.so'" \ + -i python_smi_tools/rsmiBindings.py || die cmake_src_prepare } src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON + -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF ) cmake_src_configure }