From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 103F8158010 for ; Fri, 27 Jan 2023 07:33:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 293D3E094A; Fri, 27 Jan 2023 07:33:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1522FE094A for ; Fri, 27 Jan 2023 07:33:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 226E2341070 for ; Fri, 27 Jan 2023 07:33:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EEE38893 for ; Fri, 27 Jan 2023 07:33:28 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1674804803.22c48cd7dccb5c69de56408c43d35a1a212c8f31.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/rocm-smi/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/rocm-smi/rocm-smi-9999.ebuild X-VCS-Directories: dev-util/rocm-smi/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 22c48cd7dccb5c69de56408c43d35a1a212c8f31 X-VCS-Branch: master Date: Fri, 27 Jan 2023 07:33:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1f344949-beb4-4575-b731-5bcf06963169 X-Archives-Hash: 4634848189d4530e2a7c94e617ae884a commit: 22c48cd7dccb5c69de56408c43d35a1a212c8f31 Author: Yiyang Wu gmail com> AuthorDate: Wed Jan 18 13:38:04 2023 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Fri Jan 27 07:33:23 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22c48cd7 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 gmail.com> Closes: https://github.com/gentoo/gentoo/pull/29157 Signed-off-by: Joonas Niilola gentoo.org> 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 8d35ce910b8b..bc4f8b802371 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 }