Mon Feb 24 12:30:59 2014 UTC ()
Adjust Makefile for SunOS in similar style as used for NetBSD and Drangonfly


(wiedi)
diff -r1.5 -r1.6 pkgsrc/emulators/dynamips/distinfo
diff -r1.5 -r1.6 pkgsrc/emulators/dynamips/patches/patch-aa
cvs diff -r1.5 -r1.6 pkgsrc/emulators/dynamips/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/dynamips/distinfo 2013/02/27 19:33:10 1.5
+++ pkgsrc/emulators/dynamips/distinfo 2014/02/24 12:30:59 1.6
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.5 2013/02/27 19:33:10 markd Exp $ 1$NetBSD: distinfo,v 1.6 2014/02/24 12:30:59 wiedi Exp $
2 2
3SHA1 (dynamips-0.2.8-RC2.tar.gz) = 349270690996a1e260b3eceb51ea90f94c25a59e 3SHA1 (dynamips-0.2.8-RC2.tar.gz) = 349270690996a1e260b3eceb51ea90f94c25a59e
4RMD160 (dynamips-0.2.8-RC2.tar.gz) = 0447a4c0cf516bd2b63259881c7625e26d0d838f 4RMD160 (dynamips-0.2.8-RC2.tar.gz) = 0447a4c0cf516bd2b63259881c7625e26d0d838f
5Size (dynamips-0.2.8-RC2.tar.gz) = 578935 bytes 5Size (dynamips-0.2.8-RC2.tar.gz) = 578935 bytes
6SHA1 (patch-aa) = 002d81f7155d52d9a74d5297d9a28ec3bfc26254 6SHA1 (patch-aa) = 9dce75ed9d39e6faaf3b8af7a52fa094073d6f56
cvs diff -r1.5 -r1.6 pkgsrc/emulators/dynamips/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/emulators/dynamips/patches/Attic/patch-aa 2013/02/27 19:33:11 1.5
+++ pkgsrc/emulators/dynamips/patches/Attic/patch-aa 2014/02/24 12:30:59 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.5 2013/02/27 19:33:11 markd Exp $ 1$NetBSD: patch-aa,v 1.6 2014/02/24 12:30:59 wiedi Exp $
2 2
3--- Makefile.orig 2007-10-14 08:43:07.000000000 +0000 3--- Makefile.orig 2007-10-14 08:43:07.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -3,7 +3,19 @@ 5@@ -3,7 +3,19 @@
6  6
7 # Replace x86 by amd64 for a build on x86_64. 7 # Replace x86 by amd64 for a build on x86_64.
8 # Use "nojit" for architectures that are not x86 or x86_64. 8 # Use "nojit" for architectures that are not x86 or x86_64.
9-DYNAMIPS_ARCH?=x86 9-DYNAMIPS_ARCH?=x86
10+ifeq ($(shell uname -m), i386) 10+ifeq ($(shell uname -m), i386)
11+ DYNAMIPS_ARCH?=x86 11+ DYNAMIPS_ARCH?=x86
12+else 12+else
13+ifeq ($(shell uname -m), i686) 13+ifeq ($(shell uname -m), i686)
14+ DYNAMIPS_ARCH?=x86 14+ DYNAMIPS_ARCH?=x86
@@ -36,24 +36,41 @@ $NetBSD: patch-aa,v 1.5 2013/02/27 19:33 @@ -36,24 +36,41 @@ $NetBSD: patch-aa,v 1.5 2013/02/27 19:33
36+ PTHREAD_LIBS?=-pthread 36+ PTHREAD_LIBS?=-pthread
37+ CFLAGS+=-I${LOCALBASE}/include -I${LOCALBASE}/include/libelf ${PTHREAD_CFLAGS} 37+ CFLAGS+=-I${LOCALBASE}/include -I${LOCALBASE}/include/libelf ${PTHREAD_CFLAGS}
38+ LIBS=-L${LOCALBASE}/lib -lelf ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib 38+ LIBS=-L${LOCALBASE}/lib -lelf ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib
39+else 39+else
40 ifeq ($(shell uname), Linux) 40 ifeq ($(shell uname), Linux)
41 PTHREAD_LIBS?=-lpthread 41 PTHREAD_LIBS?=-lpthread
42 # PCAP_LIB=-lpcap 42 # PCAP_LIB=-lpcap
43 CFLAGS+=-I/usr/include -I. $(PTHREAD_CFLAGS) 43 CFLAGS+=-I/usr/include -I. $(PTHREAD_CFLAGS)
44- LIBS=-L/usr/lib -L. -ldl /usr/lib/libelf.a $(PTHREAD_LIBS) 44- LIBS=-L/usr/lib -L. -ldl /usr/lib/libelf.a $(PTHREAD_LIBS)
45+ LIBS=-L${LOCALBASE}/lib -L. -ldl -lelf $(PTHREAD_LIBS) ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib 45+ LIBS=-L${LOCALBASE}/lib -L. -ldl -lelf $(PTHREAD_LIBS) ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib
46 DESTDIR=/usr 46 DESTDIR=/usr
47 else 47 else
48 ifeq ($(shell uname -s), Darwin) 48 ifeq ($(shell uname -s), Darwin)
 49@@ -66,11 +88,11 @@ ifeq ($(shell uname -s), Darwin)
 50 LIBS=-L/usr/local/lib -L. -ldl -lelf -lpthread
 51 else
 52 ifeq ($(shell uname -s), SunOS)
 53- CFLAGS+=-I/usr/local/include -DINADDR_NONE=0xFFFFFFFF \
 54- -I /opt/csw/include -DSUNOS
 55- LIBS=-L/usr/local/lib -L. -ldl -lelf -lpthread -L/opt/csw/lib \
 56- -lsocket -lnsl -lresolv
 57- PCAP_LIB=/opt/csw/lib/libpcap.a
 58+ PTHREAD_LIBS?=-pthread
 59+ CFLAGS+=-I${LOCALBASE}/include -I${LOCALBASE}/include/libelf ${PTHREAD_CFLAGS} \
 60+ -DINADDR_NONE=0xFFFFFFFF -DSUNOS
 61+ LIBS=-L${LOCALBASE}/lib -lelf ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} \
 62+ ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib -lsocket -lnsl -lresolv
 63 else
 64 ifeq ($(shell uname -o), Cygwin)
 65 CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf -DCYGWIN \
49@@ -79,7 +101,9 @@ ifeq ($(shell uname -o), Cygwin) 66@@ -79,7 +101,9 @@ ifeq ($(shell uname -o), Cygwin)
50 PCAP_LIB=-lpacket -lwpcap 67 PCAP_LIB=-lpacket -lwpcap
51 else 68 else
52 CFLAGS+=-I/usr/include/libelf -D_FILE_OFFSET_BITS=64 69 CFLAGS+=-I/usr/include/libelf -D_FILE_OFFSET_BITS=64
53- LIBS=-L. -ldl /usr/lib/libelf.a -lpthread 70- LIBS=-L. -ldl /usr/lib/libelf.a -lpthread
54+ LIBS=-L. -ldl -lelf -lpthread 71+ LIBS=-L. -ldl -lelf -lpthread
55+endif 72+endif
56+endif 73+endif
57 endif 74 endif
58 endif 75 endif
59 endif 76 endif