summaryrefslogtreecommitdiff
path: root/debian/patches/0005-gcc10.patch
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2022-10-30 18:12:02 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2022-10-30 18:12:02 +0100
commit1f3c9b4ae26ce1d46d954d509b83b8684ada5625 (patch)
tree260b922ec4d5d153cc6db745e27931cfd464472f /debian/patches/0005-gcc10.patch
parent8fcf0ba6f182918bd584bb80bf0b8998acad26a8 (diff)
parent8b758ee941f4c1ffea0532caa74b1fcd8101d1d8 (diff)
Merge branch 'release/debian/1.8.19-1'debian/1.8.19-1
Diffstat (limited to 'debian/patches/0005-gcc10.patch')
-rw-r--r--debian/patches/0005-gcc10.patch63
1 files changed, 0 insertions, 63 deletions
diff --git a/debian/patches/0005-gcc10.patch b/debian/patches/0005-gcc10.patch
deleted file mode 100644
index a4e5d8a..0000000
--- a/debian/patches/0005-gcc10.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: Fix ftbfs with gcc-10
-Author: Jörg Frings-Fürst <debian@jff.email>
-Bug: https://github.com/ipmitool/ipmitool/issues/220
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957371
-Last-Update: 2020-07-28
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/include/ipmitool/ipmi_hpmfwupg.h
-===================================================================
---- trunk.orig/include/ipmitool/ipmi_hpmfwupg.h
-+++ trunk/include/ipmitool/ipmi_hpmfwupg.h
-@@ -30,9 +30,22 @@
- * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-+
- #ifndef IPMI_HPMFWUPG_H
- #define IPMI_HPMFWUPG_H
-
-+
-+#ifdef IPMI_HPMFWUPG_MOD
-+
-+ #define EXTERN
-+
-+#else
-+
-+ #define EXTERN extern
-+
-+#endif
-+
-+
- #include <inttypes.h>
- #include <ipmitool/ipmi.h>
-
-@@ -800,10 +813,12 @@ typedef struct _VERSIONINFO {
- char descString[HPMFWUPG_DESC_STRING_LENGTH + 1];
- }VERSIONINFO, *PVERSIONINFO;
-
--VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
-+EXTERN VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
-
- #define TARGET_VER (0x01)
- #define ROLLBACK_VER (0x02)
- #define IMAGE_VER (0x04)
-
- #endif /* IPMI_KFWUM_H */
-+
-+#undef EXTERN
-Index: trunk/lib/ipmi_hpmfwupg.c
-===================================================================
---- trunk.orig/lib/ipmi_hpmfwupg.c
-+++ trunk/lib/ipmi_hpmfwupg.c
-@@ -37,7 +37,10 @@
-
- #include <ipmitool/ipmi_intf.h>
- #include <ipmitool/ipmi_mc.h>
-+
-+#define IPMI_HPMFWUPG_MOD
- #include <ipmitool/ipmi_hpmfwupg.h>
-+
- #include <ipmitool/helper.h>
- #include <ipmitool/ipmi_strings.h>
- #include <ipmitool/log.h>