mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 14:59:55 +00:00
Code Issues Projects Releases Wiki Activity

ncftp: Fix build with -fno-common

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2020-08-12 11:10:08 -07:00
parent 18e85358d3
commit 0e86a9bddd
2 changed files with 84 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-daemons/ncftp/ncftp/ncftp-3.2.5-gcc10.patch
+83
View File
@@ -0,0 +1,83 @@
Fix build with -fno-common
Patch from https://src.fedoraproject.org/rpms/ncftp/raw/master/f/ncftp-3.2.5-gcc10.patch
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- a/ncftp/bookmark.h
+++ b/ncftp/bookmark.h
@@ -29,6 +29,8 @@ typedef struct Bookmark {
int reserved;
} Bookmark;
+extern Bookmark gBm;
+
#define kBookmarkVersion 8
#define kBookmarkMinVersion 3
#if (defined(WIN32) || defined(_WINDOWS)) && !defined(__CYGWIN__)
--- a/ncftp/cmds.c
+++ b/ncftp/cmds.c
@@ -98,7 +98,7 @@ extern char gPager[], gHome[], gShell[];
extern char gOS[];
extern int gAutoResume;
extern int gAutoSaveChangesToExistingBookmarks;
-extern Bookmark gBm;
+//extern Bookmark gBm;
extern int gLoadedBm, gConfirmClose, gSavePasswords, gScreenColumns;
extern char gLocalCWD[512], gPrevLocalCWD[512];
extern int gMayCancelJmp;
--- a/ncftp/main.c
+++ b/ncftp/main.c
@@ -38,7 +38,7 @@ extern int gUnprocessedJobs;
char gLocalCWD[512], gPrevLocalCWD[512];
extern char gRemoteCWD[512], gPrevRemoteCWD[512];
-extern Bookmark gBm;
+//extern Bookmark gBm;
extern int gLoadedBm;
extern int gFirewallType;
extern char gAutoAscii[];
--- a/sh_util/gpshare.c
+++ b/sh_util/gpshare.c
@@ -28,7 +28,7 @@
static int gIsAtty1 = 1, gIsAtty2 = 1;
extern int gLoadedBm, gBookmarkMatchMode;
-Bookmark gBm;
+//Bookmark gBm;
double
FileSize(double size, const char **uStr0, double *uMult0)
--- a/sh_util/ncftpget.c
+++ b/sh_util/ncftpget.c
@@ -40,7 +40,7 @@ extern unsigned int gFirewallPort;
extern char gFirewallExceptionList[256];
extern int gFwDataPortMode;
extern const char gOS[], gVersion[];
-extern Bookmark gBm;
+//extern Bookmark gBm;
static void
#if (defined(__GNUC__)) && (__GNUC__ >= 2)
--- a/sh_util/ncftpls.c
+++ b/sh_util/ncftpls.c
@@ -39,7 +39,7 @@ extern unsigned int gFirewallPort;
extern char gFirewallExceptionList[256];
extern int gFwDataPortMode;
extern const char gOS[], gVersion[];
-extern Bookmark gBm;
+//extern Bookmark gBm;
static int FTPRemoteRecursiveMList(FTPCIPtr cip, const char *const rdir, /* FTPFileInfoListPtr files, */ FTPLineListPtr lines);
--- a/sh_util/ncftpput.c
+++ b/sh_util/ncftpput.c
@@ -41,7 +41,6 @@ extern unsigned int gFirewallPort;
extern char gFirewallExceptionList[256];
extern int gFwDataPortMode;
extern const char gOS[], gVersion[];
-extern Bookmark gBm;
extern int gSendfileInProgress;
static void
meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb
+1
View File
@@ -8,6 +8,7 @@ DEPENDS = "ncurses"
SRC_URI = "ftp://ftp.ncftp.com/${BPN}/${BP}-src.tar.xz \
file://ncftp-configure-use-BUILD_CC-for-ccdv.patch \
file://unistd.patch \
file://ncftp-3.2.5-gcc10.patch \
"
SRC_URI[md5sum] = "42d0f896d69a4d603ec097546444245f"
SRC_URI[sha256sum] = "5f200687c05d0807690d9fb770327b226f02dd86155b49e750853fce4e31098d"