From f1af93971b7490792d8541bc790e0d8c6d787059 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Sep 2019 10:28:05 +0100 Subject: gentoo resync : 06.08.2019 --- dev-util/rocminfo/Manifest | 3 ++ .../rocminfo/files/rocminfo-2.7.0-sizeof.patch | 23 ++++++++++++++ dev-util/rocminfo/rocminfo-2.7.0.ebuild | 37 ++++++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 dev-util/rocminfo/files/rocminfo-2.7.0-sizeof.patch create mode 100644 dev-util/rocminfo/rocminfo-2.7.0.ebuild (limited to 'dev-util/rocminfo') diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest index 342b79f9b920..774cf0e64b78 100644 --- a/dev-util/rocminfo/Manifest +++ b/dev-util/rocminfo/Manifest @@ -1,4 +1,7 @@ AUX rocminfo-2.6.0-cmake-variables.patch 1107 BLAKE2B b613dee2b0b44cf4d31afbe3647ebc2c511903c5a6a6a0f74b6c5b419ab17f81b1d92f5802667bfce4444f839f3dedaea0785e2cdac14b7b49be6a9b97c12971 SHA512 59fcf341a381a1fc3c60c8f4f33050f6e31f0f29f53bb9abf2d0c2d0ed28c18f799ed49bf64ebe30a8e94c463aa88a735b1895df955c671f7e589350ea010ebe +AUX rocminfo-2.7.0-sizeof.patch 1083 BLAKE2B c86e9f90660afa39b2cfcd6c5362734db31d0492ce4e9a39e9f1ca438c124f5f7e280232a1a3d0123ab2034d9fda504d8b766931638b6bba2cd883703df95183 SHA512 e32fb0cdb750780c011d032f44ae64186ad02c24cf9de8506b3224c49439d167b1c4b2f8c850765db8a210a308481bd8a69d5577bb0244ef75d68778972d791a DIST rocminfo-2.6.0.tar.gz 12293 BLAKE2B b08725b45f48e78841da9d6e57bb19a441a423e20f853d16024c620914059abf3cb2e61c12ae6fdfdb85eb3e984d488ae9975ab3fd2fcc529ecb576c6816fc92 SHA512 e2dae7e2e02b674b3ad959a3dffdcd8f550842edfd0eac5866259a6a12de1a5f935afbdcb37845fa189d0937c41186f0eb8be08e7b346ddef959d5dd7b62dca7 +DIST rocminfo-2.7.0.tar.gz 12671 BLAKE2B 6cb6e2fa458224654f4b672d117e2a6c71c7d5aeed8ac71cf7ecddb76d9209f25596521b31465a94fde1c91744fc9bf68e637f7ff4f67a000cbfbe4793c5fa4b SHA512 ffdaa3d11d85475c7600c6b25d8eb7f90cbda13b820f33c250a7ac9b90f92d4d5352d8baee765b4bd3b9c7389b5ab6d3b87df77bf62d6696ed8cd96bfc6be1a0 EBUILD rocminfo-2.6.0.ebuild 859 BLAKE2B 4e9d3a3472d368d74969ed7bfd5d269343a9612f0ee558d201d5ba24e033c9ad62ce8717abc282147c35dc01cef93e86770a89923ea8fe434bc569a6393be080 SHA512 c10a8cd4a853d7d343d907502c0064f6453cc876e6b34f6c63aec7a355f5114f598478f83d723dcc86d45c0e620b71d6e1d7bf18da429d8619fd0d699bdda88f +EBUILD rocminfo-2.7.0.ebuild 899 BLAKE2B d353500d57cf39ce63a8caccf6f9ed29d6181aa532a2054fb9ebab01502ac7a5a44d8b871d5763ee5af0111c7d11b7c6f3d1173eac6bbe75267a4513d1cd12c1 SHA512 57b2c8f3f806bde49656a749855c0797559d4d05800d62d8cce295292d11ff51315f871f14ee5c7d2c5294ccd065343134c8e3ba96bc1a60ccf16e03b5601da2 MISC metadata.xml 475 BLAKE2B c1ca0f1d0ec94ae012d3a6c2e5b0a896de75fae32ab8af40d2d0e8747544c15f11ce76cc45bd429d4b5b3b3abde5c896fed362641abf995c4bf9f10077e6933d SHA512 f84d5a379fc07d3410bf6cf946c91056295dccad64f100be02959d94e39eaa47d4fcfed84ea2bd596b2ecccb4ad3267bd86cd76b50d938b235655220fcef1549 diff --git a/dev-util/rocminfo/files/rocminfo-2.7.0-sizeof.patch b/dev-util/rocminfo/files/rocminfo-2.7.0-sizeof.patch new file mode 100644 index 000000000000..2d96bb227791 --- /dev/null +++ b/dev-util/rocminfo/files/rocminfo-2.7.0-sizeof.patch @@ -0,0 +1,23 @@ +From cf96f42165fe76b98f653f979b4c182279dcac64 Mon Sep 17 00:00:00 2001 +From: Wilfried Holzke +Date: Fri, 16 Aug 2019 22:04:52 +0200 +Subject: [PATCH] Fixed sizeof(err_val) to return the number of characters in + the array + +--- + rocminfo.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rocminfo.cc b/rocminfo.cc +index 9fddcfb..ee20da8 100755 +--- a/rocminfo.cc ++++ b/rocminfo.cc +@@ -72,7 +72,7 @@ + char* err_str = NULL; \ + if (hsa_status_string(err, \ + (const char**)&err_str) != HSA_STATUS_SUCCESS) { \ +- snprintf(&(err_val[0]), sizeof(err_val[12]), "%#x", (uint32_t)err); \ ++ snprintf(&(err_val[0]), sizeof(err_val), "%#x", (uint32_t)err); \ + err_str = &(err_val[0]); \ + } \ + printf("%shsa api call failure at: %s:%d\n", \ diff --git a/dev-util/rocminfo/rocminfo-2.7.0.ebuild b/dev-util/rocminfo/rocminfo-2.7.0.ebuild new file mode 100644 index 000000000000..6a46a0806b11 --- /dev/null +++ b/dev-util/rocminfo/rocminfo-2.7.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/" + inherit git-r3 +else + SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/roc-${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/rocminfo-roc-${PV}" +fi + +DESCRIPTION="ROCm Application for Reporting System Info" +HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo" +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" + +RDEPEND="dev-libs/rocr-runtime" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-2.6.0-cmake-variables.patch" + "${FILESDIR}/${P}-sizeof.patch" +) + +src_configure() { + local mycmakeargs=( + -DROCM_DIR="${ESYSROOT}/usr" + -DROCR_INC_DIR="${ESYSROOT}/usr/include" + -DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" + ) + cmake-utils_src_configure +} -- cgit v1.2.3