diff options
Diffstat (limited to 'emulators/dynamips/files')
-rw-r--r-- | emulators/dynamips/files/patch-Makefile | 21 | ||||
-rw-r--r-- | emulators/dynamips/files/patch-gen_eth.c | 11 |
2 files changed, 23 insertions, 9 deletions
diff --git a/emulators/dynamips/files/patch-Makefile b/emulators/dynamips/files/patch-Makefile index 42cbc60faef4..088a8e3cced2 100644 --- a/emulators/dynamips/files/patch-Makefile +++ b/emulators/dynamips/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Tue Feb 14 23:54:17 2006 -+++ Makefile Wed Mar 8 22:54:11 2006 +--- Makefile.orig Thu Sep 14 17:59:13 2006 ++++ Makefile Wed Oct 18 22:38:24 2006 @@ -12,6 +12,9 @@ # (WinPcap is used for Cygwin) HAS_PCAP?=1 @@ -8,16 +8,19 @@ +HAS_POSIX_MEMALIGN?=0 + # Current dynamips release - VERSION=0.2.4 - -@@ -25,14 +28,15 @@ - CFLAGS+=-g -Wall -O3 -fomit-frame-pointer -DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" \ + VERSION=0.2.5 + VERSION_DEV=$(VERSION)-$(shell date +%Y%m%d-%H) +@@ -30,15 +33,16 @@ + -DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" \ -DARCH_INC_FILE=$(ARCH_INC_FILE) -DDYNAMIPS_VERSION=\"$(VERSION)\" \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \ - -DHAS_RFC2553=$(HAS_RFC2553) -+ -DHAS_RFC2553=$(HAS_RFC2553) -DHAS_POSIX_MEMALIGN=$(HAS_POSIX_MEMALIGN) ++ -DHAS_RFC2553=$(HAS_RFC2553) -DHAS_POSIX_MEMALIGN=$(HAS_POSIX_MEMALIGN) - PCAP_LIB=-lpcap +-PCAP_LIB=/usr/local/lib/libpcap.a +-#PCAP_LIB=-lpcap ++#PCAP_LIB=/usr/local/lib/libpcap.a ++PCAP_LIB=-lpcap ifeq ($(shell uname), FreeBSD) PTHREAD_LIBS?=-pthread @@ -28,4 +31,4 @@ + LIBS=-L$(LOCALBASE)/lib -L. -lelf $(PTHREAD_LIBS) else ifeq ($(shell uname -s), Darwin) - CFLAGS+=-I/usr/local/include + CFLAGS+=-I/usr/local/include -mdynamic-no-pic diff --git a/emulators/dynamips/files/patch-gen_eth.c b/emulators/dynamips/files/patch-gen_eth.c new file mode 100644 index 000000000000..20f469d03d59 --- /dev/null +++ b/emulators/dynamips/files/patch-gen_eth.c @@ -0,0 +1,11 @@ +--- gen_eth.c.orig Wed Oct 18 22:39:46 2006 ++++ gen_eth.c Wed Oct 18 22:39:55 2006 +@@ -46,7 +46,7 @@ + goto pcap_error; + + /* Accept only incoming packets */ +- pcap_setdirection(p,PCAP_D_IN); ++ pcap_setdirection(p,D_IN); + #else + p = pcap_open(device,2048, + PCAP_OPENFLAG_PROMISCUOUS | |