Skip to content

Commit

Permalink
tcpdump: fix tcpdump-mini build on glibc 2.25
Browse files Browse the repository at this point in the history
Signed-off-by: Felix Fietkau <[email protected]>
  • Loading branch information
nbd168 authored and wigyori committed Oct 5, 2017
1 parent 106ce7c commit c897599
Showing 1 changed file with 7 additions and 30 deletions.
37 changes: 7 additions & 30 deletions package/network/utils/tcpdump/patches/100-tcpdump_mini.patch
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down Expand Up @@ -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

Expand All @@ -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,
Expand Down

0 comments on commit c897599

Please sign in to comment.