diff options
Diffstat (limited to 'emulators/dynamips/patches/patch-aa')
| -rw-r--r-- | emulators/dynamips/patches/patch-aa | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/emulators/dynamips/patches/patch-aa b/emulators/dynamips/patches/patch-aa index 63b4e759359..2e6f2e980df 100644 --- a/emulators/dynamips/patches/patch-aa +++ b/emulators/dynamips/patches/patch-aa @@ -1,6 +1,7 @@ -$NetBSD: patch-aa,v 1.2 2008/06/03 13:53:49 kefren Exp $ ---- Makefile.orig 2007-05-26 12:52:33 +0300 -+++ Makefile 2008-06-02 18:40:41 +0300 +$NetBSD: patch-aa,v 1.3 2010/02/05 20:10:42 markd Exp $ + +--- Makefile.orig 2007-10-14 08:43:07.000000000 +0000 ++++ Makefile @@ -3,7 +3,19 @@ # Replace x86 by amd64 for a build on x86_64. @@ -22,35 +23,24 @@ $NetBSD: patch-aa,v 1.2 2008/06/03 13:53:49 kefren Exp $ # Change this to 0 if your system doesn't support RFC 2553 extensions HAS_RFC2553?=1 -@@ -40,8 +52,8 @@ CFLAGS+=-g -Wall -O3 -fomit-frame-pointe - -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \ - -DHAS_RFC2553=$(HAS_RFC2553) - --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 -@@ -49,6 +61,16 @@ ifeq ($(shell uname), FreeBSD) - -D_FILE_OFFSET_BITS=64 - LIBS=-L/usr/local/lib -L. -lelf $(PTHREAD_LIBS) +@@ -54,6 +66,16 @@ ifeq ($(shell uname), FreeBSD) + $(PTHREAD_CFLAGS) -D_FILE_OFFSET_BITS=64 + LIBS=-L$(LOCALBASE)/lib -L. -ldl -lelf $(PTHREAD_LIBS) $(LDFLAGS) else +ifeq ($(shell uname -s), NetBSD) -+ PTHREAD_LIBS?=-pthread -+ CFLAGS+=-I${LOCALBASE}/include -I${LOCALBASE}/include/libelf ${PTHREAD_CFLAGS} -+ LIBS=-L${LOCALBASE}/lib -lelf ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} -R${LOCALBASE}/lib ++ PTHREAD_LIBS?=-pthread ++ CFLAGS+=-I${LOCALBASE}/include -I${LOCALBASE}/include/libelf ${PTHREAD_CFLAGS} ++ LIBS=-L${LOCALBASE}/lib -lelf ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} -R${LOCALBASE}/lib +else +ifeq ($(shell uname -s), DragonFly) -+ PTHREAD_LIBS?=-pthread -+ CFLAGS+=-I${LOCALBASE}/include -I${LOCALBASE}/include/libelf ${PTHREAD_CFLAGS} -+ LIBS=-L${LOCALBASE}/lib -lelf ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} -R${LOCALBASE}/lib ++ PTHREAD_LIBS?=-pthread ++ CFLAGS+=-I${LOCALBASE}/include -I${LOCALBASE}/include/libelf ${PTHREAD_CFLAGS} ++ LIBS=-L${LOCALBASE}/lib -lelf ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} -R${LOCALBASE}/lib +else ifeq ($(shell uname), Linux) PTHREAD_LIBS?=-lpthread # PCAP_LIB=-lpcap -@@ -80,6 +102,8 @@ endif +@@ -85,6 +107,8 @@ endif endif endif endif |