mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
tftp-hpa: Fix build with -fno-common
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+30
@@ -0,0 +1,30 @@
|
||||
From 2a12174a5059e84d4ff6fad8f983a4d0f2127e73 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 12 Aug 2020 12:17:31 -0700
|
||||
Subject: [PATCH] tftp: Mark toplevel definition as external
|
||||
|
||||
Fixes
|
||||
multiple definition of `toplevel'; tftp.o:/usr/src/debug/tftp-hpa/5.2-r0/tftp-hpa-5.2/tftp/tftp.c:51: first defined here
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
tftp/tftp.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tftp/tftp.c b/tftp/tftp.c
|
||||
index 9d15022..109848c 100644
|
||||
--- a/tftp/tftp.c
|
||||
+++ b/tftp/tftp.c
|
||||
@@ -48,7 +48,7 @@ extern int maxtimeout;
|
||||
#define PKTSIZE SEGSIZE+4
|
||||
char ackbuf[PKTSIZE];
|
||||
int timeout;
|
||||
-sigjmp_buf toplevel;
|
||||
+extern sigjmp_buf toplevel;
|
||||
sigjmp_buf timeoutbuf;
|
||||
|
||||
static void nak(int, const char *);
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@@ -28,6 +28,7 @@ SRC_URI = "http://kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-${PV}.t
|
||||
file://tftp-hpa-bug-fix-on-separated-CR-and-LF.patch \
|
||||
file://fix-writing-emtpy-file.patch \
|
||||
file://0001-__progname-is-provided-by-libc.patch \
|
||||
file://0001-tftp-Mark-toplevel-definition-as-external.patch \
|
||||
file://tftpd-hpa.socket \
|
||||
file://tftpd-hpa.service \
|
||||
"
|
||||
|
||||
Reference in New Issue
Block a user