Advertisement
Guest User

unstrung_64bit_diff

a guest
Oct 26th, 2015
116
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.48 KB | None | 0 0
  1. 197 => git diff
  2. diff --git a/Makefile.inc b/Makefile.inc
  3. index 156c355..6cdc86f 100644
  4. --- a/Makefile.inc
  5. +++ b/Makefile.inc
  6. @@ -9,7 +9,7 @@ INC=${UNSTRUNG_SRCDIR}/include
  7. #-I${UNSTRUNG_SRCDIR}/../tcpdump-4.6.0
  8. CFLAGS+=-I${INC}
  9. CXXFLAGS+=-I${INC}
  10. -HOSTFLAGS=-m32
  11. +HOSTFLAGS=-m64
  12.  
  13. USE_OBJDIR?=false
  14. XMLTO=xmlto
  15. @@ -48,7 +48,7 @@ TCPDUMP?=tcpdump
  16.  
  17. ifeq ($(EMBEDDED),)
  18. # needed by fake interface library
  19. -EXTRALIBS:=${LIBPCAP} ${EXTRALIBPATHS} -lusb-1.0
  20. +EXTRALIBS:=${LIBPCAP} ${EXTRALIBPATHS} -lusb-1.0 -lpthread -lnl-genl-3 -lnl-3
  21. endif
  22.  
  23. NETDISSECTLIB?=-L${UNSTRUNG_SRCDIR}/../tcpdump-4.6.0-host -lnetdissect
  24. diff --git a/build-setup-travis.sh b/build-setup-travis.sh
  25. index 814cf9a..68947a9 100755
  26. --- a/build-setup-travis.sh
  27. +++ b/build-setup-travis.sh
  28. @@ -10,14 +10,14 @@ then
  29. (cd ${BUILDTOP} && curl http://www.ca.tcpdump.org/release/tcpdump-4.7.4.tar.gz | tar xzf - )
  30. (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)
  31. (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)
  32. - (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)
  33. - (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
  34. + (cd ${BUILDTOP} && mkdir -p x86/libpcap-1.7.4 && cd x86/libpcap-1.7.4 && ../../libpcap-1.7.4/configure && make)
  35. + (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)
  36. fi
  37.  
  38. echo LIBPCAP=${BUILDTOP}/x86/libpcap-1.7.4/libpcap.a >Makefile.local
  39. echo LIBPCAP_HOST=${BUILDTOP}/host/libpcap-1.7.4/libpcap.a >>Makefile.local
  40. echo LIBPCAPINC=-I${BUILDTOP}/include >>Makefile.local
  41. -echo ARCH=i386 >>Makefile.local
  42. +echo ARCH=x86_64 >>Makefile.local
  43. echo TCPDUMP=${BUILDTOP}/host/tcpdump-4.7.4/tcpdump >>Makefile.local
  44. echo NETDISSECTLIB=${BUILDTOP}/host/tcpdump-4.7.4/libnetdissect.a >>Makefile.local
  45. 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