package/mg: fix build with gcc 10
PATCH 1/1 package/mg: fix build with gcc 10
Fixes:
- http://autobuild.buildroot.org/results/aacc02abf41e120e0d0b22faa38642e6d149d73f
Signed-off-by Fabrice Fontaine <[email protected]>
--- ...0001-src-def.h-fix-build-with-gcc-10.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/mg/0001-src-def.h-fix-build-with-gcc-10.patch
package/mg/0001-src-def.h-fix-build-with-gcc-10.patch new file +36 -0
@@ -0,0 +1,36 @@ +From 29c83c917bd4f5d0c37ff0ab5da1a85762bd5530 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +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 + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Upstream status: https://github.com/troglobit/mg/pull/7] +--- + 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 +
Signature · 1 line
2.28.0
PATCH 1/1 package/mg: fix build with gcc 10
Quoted 1 line · Fabrice Fontaine
+Signed-off-by: Fabrice Fontaine <[email protected]>
Acked-by Joachim Wiberg <[email protected]>
Quoted 1 line
+[Upstream status: https://github.com/troglobit/mg/pull/7]
Merged upstream, thank you.
Regards
/Joachim
Yann E. MORIN
AppliedPATCH 1/1 package/mg: fix build with gcc 10
In reply to Fabrice FontaineFabrice, All,
On 2020-09-05 14:54 +0200, Fabrice Fontaine spake thusly:
Quoted 4 lines
Fixes:
- http://autobuild.buildroot.org/results/aacc02abf41e120e0d0b22faa38642e6d149d73fSigned-off-by Fabrice Fontaine <[email protected]>
Applied to master, after slightly editing the patch now that it is merged upstream. Thanks!
Regards,
Yann E. MORIN.
Quoted 54 lines
--- ...0001-src-def.h-fix-build-with-gcc-10.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/mg/0001-src-def.h-fix-build-with-gcc-10.patchpackage/mg/0001-src-def.h-fix-build-with-gcc-10.patch new file +36
-0@@ -0,0 +1,36 @@ +From 29c83c917bd4f5d0c37ff0ab5da1a85762bd5530 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +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 + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Upstream status: https://github.com/troglobit/mg/pull/7] +--- + 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 +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. | '------------------------------^-------^------------------^--------------------'