NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/ncftp: fix build with gcc 10

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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2020-08-21 21:18:42 +02:00 committed by Thomas Petazzoni
parent a4bd80de75
commit 1c979b57ef
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
package/ncftp/0001-fix-gcc-10.patch Normal file
View File

@ -0,0 +1,24 @@
Fix build with gcc 10
Add missing extern to gBm to fix the following build failure with
-fno-common which is enabled by default with gcc 10:
/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: bookmark.o:(.bss+0x10): multiple definition of `gBm'; gpshare.o:(.bss+0x24): first defined here
Fixes:
- http://autobuild.buildroot.org/results/78822bc0e0039e8f8949011a256cac022863276f
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
diff -Nura ncftp-3.2.6-orig/sh_util/gpshare.c ncftp-3.2.6/sh_util/gpshare.c
--- ncftp-3.2.6-orig/sh_util/gpshare.c 2020-08-21 10:46:34.173816750 +0200
+++ ncftp-3.2.6/sh_util/gpshare.c 2020-08-21 10:52:25.407976319 +0200
@@ -28,7 +28,7 @@
static int gIsAtty1 = 1, gIsAtty2 = 1;
extern int gLoadedBm, gBookmarkMatchMode;
-Bookmark gBm;
+extern Bookmark gBm;
double
FileSize(double size, const char **uStr0, double *uMult0)