From 650b996dc07c7b3d5d45311e48e05107e9ad07d2 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 10 Aug 2020 13:08:53 -0700 Subject: [PATCH] lcdproc: fix compilation with GCC 10 Signed-off-by: Rosen Penev --- utils/lcdproc/Makefile | 2 +- utils/lcdproc/patches/120-gcc10.patch | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 utils/lcdproc/patches/120-gcc10.patch diff --git a/utils/lcdproc/Makefile b/utils/lcdproc/Makefile index f8291fda5..b34a2d836 100644 --- a/utils/lcdproc/Makefile +++ b/utils/lcdproc/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lcdproc PKG_VERSION:=0.5.9 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/lcdproc/lcdproc/releases/download/v$(PKG_VERSION)/ diff --git a/utils/lcdproc/patches/120-gcc10.patch b/utils/lcdproc/patches/120-gcc10.patch new file mode 100644 index 000000000..d33e8e417 --- /dev/null +++ b/utils/lcdproc/patches/120-gcc10.patch @@ -0,0 +1,21 @@ +--- a/clients/lcdproc/iface.c ++++ b/clients/lcdproc/iface.c +@@ -32,6 +32,7 @@ + #define UNSET_INT -1 + #define UNSET_STR "\01" + ++IfaceInfo iface[MAX_INTERFACES]; + + static int iface_count = 0; /* number of interfaces */ + static char unit_label[10] = "B"; /* default unit label is Bytes */ +--- a/clients/lcdproc/iface.h ++++ b/clients/lcdproc/iface.h +@@ -18,7 +18,7 @@ + /** max number of interfaces in multi-interface mode */ + #define MAX_INTERFACES 3 + +-IfaceInfo iface[MAX_INTERFACES]; /* interface info */ ++extern IfaceInfo iface[MAX_INTERFACES]; /* interface info */ + + /** Update screen content */ + int iface_screen(int rep, int display, int *flags_ptr);