diff options
| author | dholland <dholland> | 2012-05-23 05:13:22 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2012-05-23 05:13:22 +0000 |
| commit | 5727c0bcb7d641cb89a7161a9d37d27e0466f4f4 (patch) | |
| tree | 72b2f9b88476c40cea9c49231ff89400f7291bea | |
| parent | c5b505e8f575a1f4d7ac17105e88a082692d17ba (diff) | |
| download | pkgsrc-5727c0bcb7d641cb89a7161a9d37d27e0466f4f4.tar.gz | |
Don't hardwire /usr/lib/libelf.a, even for Linux. Should fix Linux build.
| -rw-r--r-- | emulators/dynamips/distinfo | 4 | ||||
| -rw-r--r-- | emulators/dynamips/patches/patch-aa | 24 |
2 files changed, 18 insertions, 10 deletions
diff --git a/emulators/dynamips/distinfo b/emulators/dynamips/distinfo index 3fe86206a94..b10d77b846a 100644 --- a/emulators/dynamips/distinfo +++ b/emulators/dynamips/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2010/02/05 20:10:42 markd Exp $ +$NetBSD: distinfo,v 1.4 2012/05/23 05:13:22 dholland 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) = 6a0a7a0ce822e69bc77b7957ca0d5a5ba497fadd +SHA1 (patch-aa) = 6b1a492a0abc96cb7d21e72bfb8bcca0aec75e3c diff --git a/emulators/dynamips/patches/patch-aa b/emulators/dynamips/patches/patch-aa index 2e6f2e980df..57f00e49dfe 100644 --- a/emulators/dynamips/patches/patch-aa +++ b/emulators/dynamips/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2010/02/05 20:10:42 markd Exp $ +$NetBSD: patch-aa,v 1.4 2012/05/23 05:13:22 dholland Exp $ --- Makefile.orig 2007-10-14 08:43:07.000000000 +0000 +++ Makefile @@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.3 2010/02/05 20:10:42 markd Exp $ # Change this to 0 if your system doesn't support RFC 2553 extensions HAS_RFC2553?=1 -@@ -54,6 +66,16 @@ ifeq ($(shell uname), FreeBSD) +@@ -54,11 +66,21 @@ ifeq ($(shell uname), FreeBSD) $(PTHREAD_CFLAGS) -D_FILE_OFFSET_BITS=64 LIBS=-L$(LOCALBASE)/lib -L. -ldl -lelf $(PTHREAD_LIBS) $(LDFLAGS) else @@ -40,12 +40,20 @@ $NetBSD: patch-aa,v 1.3 2010/02/05 20:10:42 markd Exp $ ifeq ($(shell uname), Linux) PTHREAD_LIBS?=-lpthread # PCAP_LIB=-lpcap -@@ -85,6 +107,8 @@ endif + 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) + DESTDIR=/usr + else + ifeq ($(shell uname -s), Darwin) +@@ -79,7 +101,9 @@ ifeq ($(shell uname -o), Cygwin) + PCAP_LIB=-lpacket -lwpcap + else + CFLAGS+=-I/usr/include/libelf -D_FILE_OFFSET_BITS=64 +- LIBS=-L. -ldl /usr/lib/libelf.a -lpthread ++ LIBS=-L. -ldl -lelf -lpthread ++endif ++endif endif endif endif -+endif -+endif - - PROG=dynamips$(BIN_EXT) - PACKAGE=$(PROG)-$(VERSION) |