diff options
| author | kefren <kefren> | 2008-06-03 13:53:49 +0000 |
|---|---|---|
| committer | kefren <kefren> | 2008-06-03 13:53:49 +0000 |
| commit | 255ecd9980057967637a24fea616684d9e8a0257 (patch) | |
| tree | d51c13d672f507bae1bfe00272a3e62f8cf588ce | |
| parent | 0e5f49e3e228bf291f86cfa04f0e320e213a7fcb (diff) | |
| download | pkgsrc-255ecd9980057967637a24fea616684d9e8a0257.tar.gz | |
Fix pkg/38836: emulators/dynamips doesn't compile in DragonFly.
Patch submitted by hasso@estpak.ee
| -rw-r--r-- | emulators/dynamips/distinfo | 4 | ||||
| -rw-r--r-- | emulators/dynamips/patches/patch-aa | 19 |
2 files changed, 14 insertions, 9 deletions
diff --git a/emulators/dynamips/distinfo b/emulators/dynamips/distinfo index ac04779e46d..0f6c3c1eb23 100644 --- a/emulators/dynamips/distinfo +++ b/emulators/dynamips/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2008/02/14 11:00:13 kefren Exp $ +$NetBSD: distinfo,v 1.2 2008/06/03 13:53:49 kefren Exp $ SHA1 (dynamips-0.2.7.tar.gz) = 6f65a2e92f5d27aca9d8608369cb20c9539a8121 RMD160 (dynamips-0.2.7.tar.gz) = 1c84f762c65dc2e83e84ee7b046793c71252c7b1 Size (dynamips-0.2.7.tar.gz) = 522620 bytes -SHA1 (patch-aa) = 56da39ce9a9a1c65ec1ad00c903c177191eaedb3 +SHA1 (patch-aa) = baf9b6d251f36d2a95994860e00fef872d5f497f diff --git a/emulators/dynamips/patches/patch-aa b/emulators/dynamips/patches/patch-aa index f2b4a78bac3..63b4e759359 100644 --- a/emulators/dynamips/patches/patch-aa +++ b/emulators/dynamips/patches/patch-aa @@ -1,7 +1,6 @@ -$NetBSD: patch-aa,v 1.1.1.1 2008/02/14 11:00:13 kefren Exp $ - ---- Makefile.orig 2007-05-26 11:52:33.000000000 +0200 -+++ Makefile 2007-07-16 19:07:57.000000000 +0200 +$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 @@ -3,7 +3,19 @@ # Replace x86 by amd64 for a build on x86_64. @@ -23,7 +22,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/02/14 11:00:13 kefren Exp $ # Change this to 0 if your system doesn't support RFC 2553 extensions HAS_RFC2553?=1 -@@ -40,8 +52,8 @@ +@@ -40,8 +52,8 @@ CFLAGS+=-g -Wall -O3 -fomit-frame-pointe -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \ -DHAS_RFC2553=$(HAS_RFC2553) @@ -34,7 +33,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/02/14 11:00:13 kefren Exp $ ifeq ($(shell uname), FreeBSD) PTHREAD_LIBS?=-pthread -@@ -49,6 +61,11 @@ +@@ -49,6 +61,16 @@ ifeq ($(shell uname), FreeBSD) -D_FILE_OFFSET_BITS=64 LIBS=-L/usr/local/lib -L. -lelf $(PTHREAD_LIBS) else @@ -43,14 +42,20 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/02/14 11:00:13 kefren Exp $ + 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 ++else ifeq ($(shell uname), Linux) PTHREAD_LIBS?=-lpthread # PCAP_LIB=-lpcap -@@ -80,6 +97,7 @@ +@@ -80,6 +102,8 @@ endif endif endif endif +endif ++endif PROG=dynamips$(BIN_EXT) PACKAGE=$(PROG)-$(VERSION) |