commit: 27c39af013c9ba5db43cd7f37eabb69b7d076873 Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> AuthorDate: Wed Aug 19 21:28:19 2020 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Wed Aug 19 21:28:35 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c39af0
sys-apps/ipmitool-1.8.18-r1: Fix build with gcc-10 (bug #706870) Closes: https://bugs.gentoo.org/706870 Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> .../files/ipmitool-1.8.18-fno-common.patch | 22 ++++++++++++++++++++++ sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild | 1 + 2 files changed, 23 insertions(+) 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 new file mode 100644 index 00000000000..5ca554961ca --- /dev/null +++ b/sys-apps/ipmitool/files/ipmitool-1.8.18-fno-common.patch @@ -0,0 +1,22 @@ +--- a/include/ipmitool/ipmi_hpmfwupg.h ++++ b/include/ipmitool/ipmi_hpmfwupg.h +@@ -800,8 +800,6 @@ + char descString[HPMFWUPG_DESC_STRING_LENGTH + 1]; + }VERSIONINFO, *PVERSIONINFO; + +-VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; +- + #define TARGET_VER (0x01) + #define ROLLBACK_VER (0x02) + #define IMAGE_VER (0x04) +--- a/lib/ipmi_hpmfwupg.c ++++ b/lib/ipmi_hpmfwupg.c +@@ -52,6 +52,8 @@ + # include <config.h> + #endif + ++static VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; ++ + /* From src/plugins/ipmi_intf.c: */ + uint16_t + ipmi_intf_get_max_request_data_size(struct ipmi_intf * intf); diff --git a/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild index 9b95f9ff8ce..314005e456a 100644 --- a/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild +++ b/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild @@ -31,6 +31,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${P}-openssl-1.1.patch + "${FILESDIR}/ipmitool-1.8.18-fno-common.patch" ) src_prepare() {
