| 1 |
commit: 27c39af013c9ba5db43cd7f37eabb69b7d076873 |
| 2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
| 3 |
AuthorDate: Wed Aug 19 21:28:19 2020 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 19 21:28:35 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c39af0 |
| 7 |
|
| 8 |
sys-apps/ipmitool-1.8.18-r1: Fix build with gcc-10 (bug #706870) |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/706870 |
| 11 |
Copyright: Sony Interactive Entertainment Inc. |
| 12 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 13 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/ipmitool-1.8.18-fno-common.patch | 22 ++++++++++++++++++++++ |
| 16 |
sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild | 1 + |
| 17 |
2 files changed, 23 insertions(+) |
| 18 |
|
| 19 |
diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.18-fno-common.patch b/sys-apps/ipmitool/files/ipmitool-1.8.18-fno-common.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..5ca554961ca |
| 22 |
--- /dev/null |
| 23 |
+++ b/sys-apps/ipmitool/files/ipmitool-1.8.18-fno-common.patch |
| 24 |
@@ -0,0 +1,22 @@ |
| 25 |
+--- a/include/ipmitool/ipmi_hpmfwupg.h |
| 26 |
++++ b/include/ipmitool/ipmi_hpmfwupg.h |
| 27 |
+@@ -800,8 +800,6 @@ |
| 28 |
+ char descString[HPMFWUPG_DESC_STRING_LENGTH + 1]; |
| 29 |
+ }VERSIONINFO, *PVERSIONINFO; |
| 30 |
+ |
| 31 |
+-VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; |
| 32 |
+- |
| 33 |
+ #define TARGET_VER (0x01) |
| 34 |
+ #define ROLLBACK_VER (0x02) |
| 35 |
+ #define IMAGE_VER (0x04) |
| 36 |
+--- a/lib/ipmi_hpmfwupg.c |
| 37 |
++++ b/lib/ipmi_hpmfwupg.c |
| 38 |
+@@ -52,6 +52,8 @@ |
| 39 |
+ # include <config.h> |
| 40 |
+ #endif |
| 41 |
+ |
| 42 |
++static VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; |
| 43 |
++ |
| 44 |
+ /* From src/plugins/ipmi_intf.c: */ |
| 45 |
+ uint16_t |
| 46 |
+ ipmi_intf_get_max_request_data_size(struct ipmi_intf * intf); |
| 47 |
|
| 48 |
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild |
| 49 |
index 9b95f9ff8ce..314005e456a 100644 |
| 50 |
--- a/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild |
| 51 |
+++ b/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild |
| 52 |
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND} |
| 53 |
|
| 54 |
PATCHES=( |
| 55 |
"${FILESDIR}"/${P}-openssl-1.1.patch |
| 56 |
+ "${FILESDIR}/ipmitool-1.8.18-fno-common.patch" |
| 57 |
) |
| 58 |
|
| 59 |
src_prepare() { |
Archives