mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-26 18:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

inetutils: Fix build with -fno-common

Browse Source 
Fixes errors like

telnetd/state.c:69: multiple definition of `not42'; utility.o:/usr/src/debug/inetutils/1.9.4-r0/build/telnetd/../../inetutils-1.9.4/telnetd/utility.c:66: first defined here
| clang-11: error: linker command failed with exit code 1 (use -v to see invocation)

(From OE-Core rev: 555bb1191459aa2a05a4ed9e044c0eba085a7162)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2020-08-05 10:50:08 -07:00
committed by Richard Purdie
parent b148043e0e
commit 35d23eaf53
2 changed files with 59 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
meta/recipes-connectivity/inetutils/inetutils/0001-ftpd-telnetd-Fix-multiple-definitions-of-errcatch-an.patch Normal file
View File

@@ -0,0 +1,58 @@
From 7d39930468e272c740b0eed3c7e5b7fb3abf29e8 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 5 Aug 2020 10:36:22 -0700
Subject: [PATCH] ftpd,telnetd: Fix multiple definitions of errcatch and not42
This helps fix build failures when -fno-common option is used
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
ftpd/extern.h | 2 +-
ftpd/ftpcmd.c | 1 +
telnetd/utility.c | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ftpd/extern.h b/ftpd/extern.h
index ab33cf3..91dbbee 100644
--- a/ftpd/extern.h
+++ b/ftpd/extern.h
@@ -90,7 +90,7 @@ extern void user (const char *);
extern char *sgetsave (const char *);
/* Exported from ftpd.c. */
-jmp_buf errcatch;
+extern jmp_buf errcatch;
extern struct sockaddr_storage data_dest;
extern socklen_t data_dest_len;
extern struct sockaddr_storage his_addr;
diff --git a/ftpd/ftpcmd.c b/ftpd/ftpcmd.c
index beb1f06..d272e9d 100644
--- a/ftpd/ftpcmd.c
+++ b/ftpd/ftpcmd.c
@@ -106,6 +106,7 @@
#endif
off_t restart_point;
+jmp_buf errcatch;
static char cbuf[512]; /* Command Buffer. */
static char *fromname;
diff --git a/telnetd/utility.c b/telnetd/utility.c
index e7ffb8e..46bf91e 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -63,7 +63,7 @@ static int ncc;
static char ptyibuf[BUFSIZ], *ptyip;
static int pcc;
-int not42;
+extern int not42;
static int
readstream (int p, char *ibuf, int bufsize)
--
2.28.0

1
meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb
View File

@@ -23,6 +23,7 @@ SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \
file://inetutils-only-check-pam_appl.h-when-pam-enabled.patch \
file://0001-rcp-fix-to-work-with-large-files.patch \
file://fix-buffer-fortify-tfpt.patch \
file://0001-ftpd-telnetd-Fix-multiple-definitions-of-errcatch-an.patch \
"
SRC_URI[md5sum] = "04852c26c47cc8c6b825f2b74f191f52"