From: Felix Fietkau <nbd@nbd.name>
Date: Sat, 11 Feb 2017 15:38:59 +0000 (+0100)
Subject: tcpdump: fix tcpdump-mini build on glibc 2.25
X-Git-Tag: v18.06.0-rc1~3696
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c22255e50ee8843c4e4d6c674b704ca33182f0ce;p=oweals%2Fopenwrt.git

tcpdump: fix tcpdump-mini build on glibc 2.25

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/package/network/utils/tcpdump/patches/100-tcpdump_mini.patch b/package/network/utils/tcpdump/patches/100-tcpdump_mini.patch
index 26dbe13e3a..618ea0869b 100644
--- a/package/network/utils/tcpdump/patches/100-tcpdump_mini.patch
+++ b/package/network/utils/tcpdump/patches/100-tcpdump_mini.patch
@@ -1,15 +1,13 @@
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -70,6 +70,82 @@ DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
- 	@rm -f $@
- 	$(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
+@@ -72,6 +72,80 @@ DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
+ 
+ CSRC =	setsignal.c tcpdump.c
  
 +ifdef TCPDUMP_MINI
 +
-+CSRC=\
-+	tcpdump.c \
++LIBNETDISSECT_SRC=\
 +	netdissect.c \
-+	setsignal.c \
 +	addrtoname.c \
 +	addrtostr.c \
 +	af.c \
@@ -80,10 +78,10 @@
 +
 +else
 +
- CSRC =	setsignal.c tcpdump.c
- 
  LIBNETDISSECT_SRC=\
-@@ -237,12 +313,16 @@ LIBNETDISSECT_SRC=\
+ 	addrtoname.c \
+ 	addrtostr.c \
+@@ -237,6 +311,8 @@ LIBNETDISSECT_SRC=\
  	strtoaddr.c \
  	util-print.c
  
@@ -92,27 +90,6 @@
  LOCALSRC = @LOCALSRC@
  GENSRC = version.c
  LIBOBJS = @LIBOBJS@
- 
-+ifndef TCPDUMP_MINI
- LIBNETDISSECT_OBJ=$(LIBNETDISSECT_SRC:.c=.o) ${LOCALSRC:.c=.o} ${LIBOBJS}
- LIBNETDISSECT=libnetdissect.a
-+endif
- 
- 
- SRC =	$(CSRC) $(GENSRC) $(LOCALSRC) $(LIBNETDISSECT_SRC)
-@@ -373,10 +453,12 @@ $(PROG): $(OBJ) @V_PCAPDEP@
- 	@rm -f $@
- 	$(CC) $(FULL_CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
- 
-+ifndef TCPDUMP_MINI
- $(LIBNETDISSECT): $(LIBNETDISSECT_OBJ)
- 	@rm -f $@
- 	$(AR) cr $@ $(LIBNETDISSECT_OBJ)
- 	$(RANLIB) $@
-+endif
- 
- datalinks.o: $(srcdir)/missing/datalinks.c
- 	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/datalinks.c
 --- a/addrtoname.c
 +++ b/addrtoname.c
 @@ -566,8 +566,10 @@ linkaddr_string(netdissect_options *ndo,