Skip to contentSkip to conversation

package/lcdproc: renumber patch

PATCH New Fabrice Fontaine 3 participants 5 messages Sep 5, 2020 – Sep 9, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/lcdproc: renumber patch

---
 ...ing-ioctl-header.patch => 0002-Add-missing-ioctl-header.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/lcdproc/{0001-Add-missing-ioctl-header.patch => 0002-Add-missing-ioctl-header.patch} (100%)
package/lcdproc/0002-Add-missing-ioctl-header.patch renamed from package/lcdproc/0001-Add-missing-ioctl-header.patch +0 -0
similarity index 100%
rename from package/lcdproc/0001-Add-missing-ioctl-header.patch
rename to package/lcdproc/0002-Add-missing-ioctl-header.patch
Signature · 1 line
2.28.0
#1 lore raw

PATCH 2/2 package/lcdproc: fix build with gcc 10

Fixes:
- http://autobuild.buildroot.org/results/67367f43cf8b2cc74e9a4f51f9d685ef058d5745

---
 .../0003-Fixcompilation-with-GCC-10-x.patch   | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 package/lcdproc/0003-Fixcompilation-with-GCC-10-x.patch
package/lcdproc/0003-Fixcompilation-with-GCC-10-x.patch new file +46 -0
new file mode 100644
index 0000000000..c8a3dc20a3
@@ -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);
Signature · 1 line
2.28.0
#3 lore raw

PATCH 1/2 package/lcdproc: renumber patch

In reply to Fabrice Fontaine

Fabrice, All,

On 2020-09-05 14:17 +0200, Fabrice Fontaine spake thusly:

Quoted 1 line

Both patches applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 16 lines
---
 ...ing-ioctl-header.patch => 0002-Add-missing-ioctl-header.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/lcdproc/{0001-Add-missing-ioctl-header.patch => 0002-Add-missing-ioctl-header.patch} (100%)
package/lcdproc/0002-Add-missing-ioctl-header.patch renamed from package/lcdproc/0001-Add-missing-ioctl-header.patch +0 -0
similarity index 100%
rename from package/lcdproc/0001-Add-missing-ioctl-header.patch
rename to package/lcdproc/0002-Add-missing-ioctl-header.patch
Signature · 6 lines
2.28.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'