Skip to content

Commit

Permalink
package/lcdproc: fix build with gcc 10
Browse files Browse the repository at this point in the history
  • Loading branch information
ffontaine authored and yann-morin-1998 committed Sep 5, 2020
1 parent 32f8033 commit 95c51a3
Showing 1 changed file with 46 additions and 0 deletions.
46 changes: 46 additions & 0 deletions package/lcdproc/0003-Fixcompilation-with-GCC-10-x.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
From 084126b03f29b33ab3e657c66e8c6a439f27f8e1 Mon Sep 17 00:00:00 2001
From: Harald Geyer <[email protected]>
Date: Mon, 10 Feb 2020 13:15:10 +0100
Subject: [PATCH] Fix compilation with GCC >= 10.x

Starting with GCC >= 10.x, -fno-common is used as default
instead of -fcommon. This patch fixes the compilation.

Closes: #148

Suggested-by: Conrad Kostecki <[email protected]>
Signed-off-by: Harald Geyer <[email protected]>

[Retrieved from:
https://github.com/lcdproc/lcdproc/commit/084126b03f29b33ab3e657c66e8c6a439f27f8e1]
Signed-off-by: Fabrice Fontaine <[email protected]>
---
clients/lcdproc/iface.c | 1 +
clients/lcdproc/iface.h | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/clients/lcdproc/iface.c b/clients/lcdproc/iface.c
index 40e50cb7..1ac355bd 100644
--- 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 */
diff --git a/clients/lcdproc/iface.h b/clients/lcdproc/iface.h
index cc6dbaaf..c1bd6b5b 100644
--- 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);

0 comments on commit 95c51a3

Please sign in to comment.