diff --git a/packages/ipmitool/build.sh b/packages/ipmitool/build.sh index eb6162c31a..3ce7b137f3 100644 --- a/packages/ipmitool/build.sh +++ b/packages/ipmitool/build.sh @@ -7,4 +7,3 @@ TERMUX_PKG_REVISION=8 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/ipmitool/ipmitool/$TERMUX_PKG_VERSION/ipmitool-$TERMUX_PKG_VERSION.tar.bz2 TERMUX_PKG_SHA256=0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01 TERMUX_PKG_DEPENDS="ncurses, openssl, readline" - diff --git a/packages/ipmitool/multiple-definitions.patch b/packages/ipmitool/multiple-definitions.patch new file mode 100644 index 0000000000..d5ae65c47a --- /dev/null +++ b/packages/ipmitool/multiple-definitions.patch @@ -0,0 +1,24 @@ +https://git.alpinelinux.org/aports/tree/community/ipmitool/gcc-10.patch + +--- 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 + #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);