mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-11-23 13:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

package/mg: fix build with gcc 10

Browse Source 
Fixes:
 - http://autobuild.buildroot.org/results/aacc02abf41e120e0d0b22faa38642e6d149d73f

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Acked-by: Joachim Wiberg <troglobit@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Fabrice Fontaine 2020-09-05 14:54:44 +02:00 committed by Yann E. MORIN
parent 36ea6e64a3
commit 4823661825
1 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
package/mg/0001-src-def.h-fix-build-with-gcc-10.patch Normal file
View File

@ -0,0 +1,38 @@
From 29c83c917bd4f5d0c37ff0ab5da1a85762bd5530 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sat, 5 Sep 2020 14:50:20 +0200
Subject: [PATCH] src/def.h: fix build with gcc 10
Define hlp as extern to avoid the following build failure with gcc 10
(which defaults to -fno-common):
CCLD mg
/home/buildroot/autobuild/run/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: mg-bell.o:(.bss+0x0): multiple definition of `hlp'; mg-basic.o:(.bss+0x0): first defined here
Fixes:
- http://autobuild.buildroot.org/results/aacc02abf41e120e0d0b22faa38642e6d149d73f
[backport of upstream 29c83c917bd4f5d0c37ff0ab5da1a85762bd5530]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[yann.morin.1998@free.fr: backport actual patch after MR was accepted]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
src/def.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/def.h b/src/def.h
index e4c049c..cd59725 100644
--- a/src/def.h
+++ b/src/def.h
@@ -650,7 +650,7 @@ int excline(char *);
char *skipwhite(char *);
/* help.c X */
-const char *hlp;
+extern const char *hlp;
int desckey(int, int);
int wallchart(int, int);
int help_help(int, int);
--
2.28.0