Gentoo Archives: gentoo-commits

From: Craig Andrews <candrews@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/rocminfo/files/
Date: Sun, 30 Aug 2020 20:04:58
Message-Id: 1598817891.9fce8eb0fc30b03961cbc6f78c68fefab77d5d2e.candrews@gentoo
1 commit: 9fce8eb0fc30b03961cbc6f78c68fefab77d5d2e
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Fri Aug 28 16:46:41 2020 +0000
4 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 30 20:04:51 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fce8eb0
7
8 dev-util/rocminfo: remove unused patch(es)
9
10 Package-Manager: Portage-3.0.4, Repoman-3.0.1
11 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
12 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
13
14 .../files/rocminfo-2.6.0-cmake-variables.patch | 31 ----------------------
15 .../rocminfo/files/rocminfo-2.7.0-sizeof.patch | 23 ----------------
16 2 files changed, 54 deletions(-)
17
18 diff --git a/dev-util/rocminfo/files/rocminfo-2.6.0-cmake-variables.patch b/dev-util/rocminfo/files/rocminfo-2.6.0-cmake-variables.patch
19 deleted file mode 100644
20 index 1678f504327..00000000000
21 --- a/dev-util/rocminfo/files/rocminfo-2.6.0-cmake-variables.patch
22 +++ /dev/null
23 @@ -1,31 +0,0 @@
24 -https://github.com/RadeonOpenCompute/rocminfo/pull/17
25 -
26 -From c9bfc4b3db029b8502f900cd9bb545a675ca0898 Mon Sep 17 00:00:00 2001
27 -From: Craig Andrews <candrews@××××××××××××.com>
28 -Date: Thu, 25 Jul 2019 17:59:51 -0400
29 -Subject: [PATCH] Use CACHE variables, allow overriding
30 - ROCR_LIB_DIR/ROCR_INC_DIR
31 -
32 -CACHE variables allow for variables to be documented, and ROCR_LIB_DIR/ROCR_INC_DIR should be overridable as they'll have different values on different Linux distributions.
33 ----
34 - CMakeLists.txt | 7 ++++---
35 - 1 file changed, 4 insertions(+), 3 deletions(-)
36 -
37 -diff --git a/CMakeLists.txt b/CMakeLists.txt
38 -index b5fa9dd..f8f430f 100755
39 ---- a/CMakeLists.txt
40 -+++ b/CMakeLists.txt
41 -@@ -43,9 +43,10 @@ endif()
42 - #
43 -
44 - # Required Defines first:
45 --
46 --set(ROCR_INC_DIR ${ROCM_DIR}/include)
47 --set(ROCR_LIB_DIR ${ROCM_DIR}/lib)
48 -+set(ROCRTST_BLD_BITS CACHE "64" STRING "Either 32 or 64")
49 -+set(ROCM_DIR CACHE PATH "Root for RocM install")
50 -+set(ROCR_INC_DIR ${ROCM_DIR}/include CACHE PATH "Path for RocM includes")
51 -+set(ROCR_LIB_DIR ${ROCM_DIR}/lib CACHE PATH "Path for RocM libraries")
52 - #
53 - # Determine ROCR Header files are present
54 - #
55
56 diff --git a/dev-util/rocminfo/files/rocminfo-2.7.0-sizeof.patch b/dev-util/rocminfo/files/rocminfo-2.7.0-sizeof.patch
57 deleted file mode 100644
58 index 2d96bb22779..00000000000
59 --- a/dev-util/rocminfo/files/rocminfo-2.7.0-sizeof.patch
60 +++ /dev/null
61 @@ -1,23 +0,0 @@
62 -From cf96f42165fe76b98f653f979b4c182279dcac64 Mon Sep 17 00:00:00 2001
63 -From: Wilfried Holzke <gentoo@××××××.net>
64 -Date: Fri, 16 Aug 2019 22:04:52 +0200
65 -Subject: [PATCH] Fixed sizeof(err_val) to return the number of characters in
66 - the array
67 -
68 ----
69 - rocminfo.cc | 2 +-
70 - 1 file changed, 1 insertion(+), 1 deletion(-)
71 -
72 -diff --git a/rocminfo.cc b/rocminfo.cc
73 -index 9fddcfb..ee20da8 100755
74 ---- a/rocminfo.cc
75 -+++ b/rocminfo.cc
76 -@@ -72,7 +72,7 @@
77 - char* err_str = NULL; \
78 - if (hsa_status_string(err, \
79 - (const char**)&err_str) != HSA_STATUS_SUCCESS) { \
80 -- snprintf(&(err_val[0]), sizeof(err_val[12]), "%#x", (uint32_t)err); \
81 -+ snprintf(&(err_val[0]), sizeof(err_val), "%#x", (uint32_t)err); \
82 - err_str = &(err_val[0]); \
83 - } \
84 - printf("%shsa api call failure at: %s:%d\n", \