summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-08-05 10:50:08 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-06 15:12:39 +0100
commit35d23eaf53181b5928a05028b6f06345c9d6b8e1 (patch)
tree012d314a9af149de60c151a0a31966ef0f9c32ae /meta/recipes-connectivity
parentb148043e0e2b10fc300c806b596d70397071b286 (diff)
downloadpoky-35d23eaf53181b5928a05028b6f06345c9d6b8e1.tar.gz
inetutils: Fix build with -fno-common
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>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils/0001-ftpd-telnetd-Fix-multiple-definitions-of-errcatch-an.patch58
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb1
2 files changed, 59 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/inetutils/inetutils/0001-ftpd-telnetd-Fix-multiple-definitions-of-errcatch-an.patch b/meta/recipes-connectivity/inetutils/inetutils/0001-ftpd-telnetd-Fix-multiple-definitions-of-errcatch-an.patch
new file mode 100644
index 0000000000..49d319f59d
--- /dev/null
+++ b/meta/recipes-connectivity/inetutils/inetutils/0001-ftpd-telnetd-Fix-multiple-definitions-of-errcatch-an.patch
@@ -0,0 +1,58 @@
1From 7d39930468e272c740b0eed3c7e5b7fb3abf29e8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 5 Aug 2020 10:36:22 -0700
4Subject: [PATCH] ftpd,telnetd: Fix multiple definitions of errcatch and not42
5
6This helps fix build failures when -fno-common option is used
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 ftpd/extern.h | 2 +-
14 ftpd/ftpcmd.c | 1 +
15 telnetd/utility.c | 2 +-
16 3 files changed, 3 insertions(+), 2 deletions(-)
17
18diff --git a/ftpd/extern.h b/ftpd/extern.h
19index ab33cf3..91dbbee 100644
20--- a/ftpd/extern.h
21+++ b/ftpd/extern.h
22@@ -90,7 +90,7 @@ extern void user (const char *);
23 extern char *sgetsave (const char *);
24
25 /* Exported from ftpd.c. */
26-jmp_buf errcatch;
27+extern jmp_buf errcatch;
28 extern struct sockaddr_storage data_dest;
29 extern socklen_t data_dest_len;
30 extern struct sockaddr_storage his_addr;
31diff --git a/ftpd/ftpcmd.c b/ftpd/ftpcmd.c
32index beb1f06..d272e9d 100644
33--- a/ftpd/ftpcmd.c
34+++ b/ftpd/ftpcmd.c
35@@ -106,6 +106,7 @@
36 #endif
37
38 off_t restart_point;
39+jmp_buf errcatch;
40
41 static char cbuf[512]; /* Command Buffer. */
42 static char *fromname;
43diff --git a/telnetd/utility.c b/telnetd/utility.c
44index e7ffb8e..46bf91e 100644
45--- a/telnetd/utility.c
46+++ b/telnetd/utility.c
47@@ -63,7 +63,7 @@ static int ncc;
48 static char ptyibuf[BUFSIZ], *ptyip;
49 static int pcc;
50
51-int not42;
52+extern int not42;
53
54 static int
55 readstream (int p, char *ibuf, int bufsize)
56--
572.28.0
58
diff --git a/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb b/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb
index cc9410b94e..adf6d4414e 100644
--- a/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb
+++ b/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb
@@ -23,6 +23,7 @@ SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \
23 file://inetutils-only-check-pam_appl.h-when-pam-enabled.patch \ 23 file://inetutils-only-check-pam_appl.h-when-pam-enabled.patch \
24 file://0001-rcp-fix-to-work-with-large-files.patch \ 24 file://0001-rcp-fix-to-work-with-large-files.patch \
25 file://fix-buffer-fortify-tfpt.patch \ 25 file://fix-buffer-fortify-tfpt.patch \
26 file://0001-ftpd-telnetd-Fix-multiple-definitions-of-errcatch-an.patch \
26" 27"
27 28
28SRC_URI[md5sum] = "04852c26c47cc8c6b825f2b74f191f52" 29SRC_URI[md5sum] = "04852c26c47cc8c6b825f2b74f191f52"