Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- 197 => git diff
- diff --git a/Makefile.inc b/Makefile.inc
- index 156c355..6cdc86f 100644
- --- a/Makefile.inc
- +++ b/Makefile.inc
- @@ -9,7 +9,7 @@ INC=${UNSTRUNG_SRCDIR}/include
- #-I${UNSTRUNG_SRCDIR}/../tcpdump-4.6.0
- CFLAGS+=-I${INC}
- CXXFLAGS+=-I${INC}
- -HOSTFLAGS=-m32
- +HOSTFLAGS=-m64
- USE_OBJDIR?=false
- XMLTO=xmlto
- @@ -48,7 +48,7 @@ TCPDUMP?=tcpdump
- ifeq ($(EMBEDDED),)
- # needed by fake interface library
- -EXTRALIBS:=${LIBPCAP} ${EXTRALIBPATHS} -lusb-1.0
- +EXTRALIBS:=${LIBPCAP} ${EXTRALIBPATHS} -lusb-1.0 -lpthread -lnl-genl-3 -lnl-3
- endif
- NETDISSECTLIB?=-L${UNSTRUNG_SRCDIR}/../tcpdump-4.6.0-host -lnetdissect
- diff --git a/build-setup-travis.sh b/build-setup-travis.sh
- index 814cf9a..68947a9 100755
- --- a/build-setup-travis.sh
- +++ b/build-setup-travis.sh
- @@ -10,14 +10,14 @@ then
- (cd ${BUILDTOP} && curl http://www.ca.tcpdump.org/release/tcpdump-4.7.4.tar.gz | tar xzf - )
- (cd ${BUILDTOP} && mkdir -p host/libpcap-1.7.4 && cd host/libpcap-1.7.4 && ../../libpcap-1.7.4/configure --prefix=${BUILDTOP} && make && make install)
- (cd ${BUILDTOP} && mkdir -p host/tcpdump-4.7.4 && cd host/tcpdump-4.7.4 && ../../tcpdump-4.7.4/configure --prefix=${BUILDTOP} && make && make install)
- - (cd ${BUILDTOP} && mkdir -p x86/libpcap-1.7.4 && cd x86/libpcap-1.7.4 && CFLAGS=-m32 ../../libpcap-1.7.4/configure --target=i686-pc-linux-gnu && make LDFLAGS=-m32 CFLAGS=-m32)
- - (cd ${BUILDTOP} && ln -s x86/libpcap-1.7.4 libpcap && mkdir -p x86/tcpdump-4.7.4 && cd x86/tcpdump-4.7.4 && CFLAGS=-m32 ../../tcpdump-4.7.4/configure --target=i686-pc-linux-gnu && make LDFLAGS=-m
- + (cd ${BUILDTOP} && mkdir -p x86/libpcap-1.7.4 && cd x86/libpcap-1.7.4 && ../../libpcap-1.7.4/configure && make)
- + (cd ${BUILDTOP} && ln -s x86/libpcap-1.7.4 libpcap && mkdir -p x86/tcpdump-4.7.4 && cd x86/tcpdump-4.7.4 && ../../tcpdump-4.7.4/configure && make)
- fi
- echo LIBPCAP=${BUILDTOP}/x86/libpcap-1.7.4/libpcap.a >Makefile.local
- echo LIBPCAP_HOST=${BUILDTOP}/host/libpcap-1.7.4/libpcap.a >>Makefile.local
- echo LIBPCAPINC=-I${BUILDTOP}/include >>Makefile.local
- -echo ARCH=i386 >>Makefile.local
- +echo ARCH=x86_64 >>Makefile.local
- echo TCPDUMP=${BUILDTOP}/host/tcpdump-4.7.4/tcpdump >>Makefile.local
- echo NETDISSECTLIB=${BUILDTOP}/host/tcpdump-4.7.4/libnetdissect.a >>Makefile.local
- echo NETDISSECTH=-DNETDISSECT -I${BUILDTOP}/include -I${BUILDTOP}/host/tcpdump-4.7.4/ -I${BUILDTOP}/tcpdump-4.7.4 >>Makefile.local
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement