diff options
| author | markd <markd> | 2013-02-27 19:33:10 +0000 |
|---|---|---|
| committer | markd <markd> | 2013-02-27 19:33:10 +0000 |
| commit | 2879e9c9991f64412de7c2274cae967659b49323 (patch) | |
| tree | b3bbb9978f7c05ae50ded68ea2fe5389c91d21d9 /emulators/dynamips | |
| parent | 985ecd56f2307e02d4c7eab0f56f68e05d8217aa (diff) | |
| download | pkgsrc-2879e9c9991f64412de7c2274cae967659b49323.tar.gz | |
Fix linking on Linux. While here use ${COMPILER_RPATH_FLAG}
on NetBSD and DragonFly.
Diffstat (limited to 'emulators/dynamips')
| -rw-r--r-- | emulators/dynamips/distinfo | 4 | ||||
| -rw-r--r-- | emulators/dynamips/patches/patch-aa | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/emulators/dynamips/distinfo b/emulators/dynamips/distinfo index b10d77b846a..420ad4791d1 100644 --- a/emulators/dynamips/distinfo +++ b/emulators/dynamips/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2012/05/23 05:13:22 dholland Exp $ +$NetBSD: distinfo,v 1.5 2013/02/27 19:33:10 markd Exp $ SHA1 (dynamips-0.2.8-RC2.tar.gz) = 349270690996a1e260b3eceb51ea90f94c25a59e RMD160 (dynamips-0.2.8-RC2.tar.gz) = 0447a4c0cf516bd2b63259881c7625e26d0d838f Size (dynamips-0.2.8-RC2.tar.gz) = 578935 bytes -SHA1 (patch-aa) = 6b1a492a0abc96cb7d21e72bfb8bcca0aec75e3c +SHA1 (patch-aa) = 002d81f7155d52d9a74d5297d9a28ec3bfc26254 diff --git a/emulators/dynamips/patches/patch-aa b/emulators/dynamips/patches/patch-aa index 57f00e49dfe..94ecd404735 100644 --- a/emulators/dynamips/patches/patch-aa +++ b/emulators/dynamips/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2012/05/23 05:13:22 dholland Exp $ +$NetBSD: patch-aa,v 1.5 2013/02/27 19:33:11 markd Exp $ --- Makefile.orig 2007-10-14 08:43:07.000000000 +0000 +++ Makefile @@ -30,19 +30,19 @@ $NetBSD: patch-aa,v 1.4 2012/05/23 05:13:22 dholland Exp $ +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 ++ LIBS=-L${LOCALBASE}/lib -lelf ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} ${COMPILER_RPATH_FLAG}${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 ++ LIBS=-L${LOCALBASE}/lib -lelf ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib +else ifeq ($(shell uname), Linux) PTHREAD_LIBS?=-lpthread # PCAP_LIB=-lpcap CFLAGS+=-I/usr/include -I. $(PTHREAD_CFLAGS) - LIBS=-L/usr/lib -L. -ldl /usr/lib/libelf.a $(PTHREAD_LIBS) -+ LIBS=-L/usr/lib -L. -ldl -lelf $(PTHREAD_LIBS) ++ LIBS=-L${LOCALBASE}/lib -L. -ldl -lelf $(PTHREAD_LIBS) ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib DESTDIR=/usr else ifeq ($(shell uname -s), Darwin) |