diff options
| author | Max Khon <fjoe@FreeBSD.org> | 2007-07-03 15:29:23 +0000 |
|---|---|---|
| committer | Max Khon <fjoe@FreeBSD.org> | 2007-07-03 15:29:23 +0000 |
| commit | 3e9eaed62a2fcfebc44dc556eef4558131f159ba (patch) | |
| tree | 8a6284523941df7101e082c2b0222e0903a55c7f /emulators/dynamips/files/patch-Makefile | |
| parent | - IGNORE on 7.0. It's already in base. (diff) | |
Update to 0.2.7.
PR: 113808
Submitted by: Pavel I Volkov
Notes
Notes:
svn path=/head/; revision=194796
Diffstat (limited to 'emulators/dynamips/files/patch-Makefile')
| -rw-r--r-- | emulators/dynamips/files/patch-Makefile | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/emulators/dynamips/files/patch-Makefile b/emulators/dynamips/files/patch-Makefile index 8f90939acbd7..f5ef297cafed 100644 --- a/emulators/dynamips/files/patch-Makefile +++ b/emulators/dynamips/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Thu Sep 14 17:59:13 2006 -+++ Makefile Tue Nov 14 10:27:26 2006 +--- Makefile.orig Thu Feb 8 15:23:36 2007 ++++ Makefile Thu Feb 8 15:34:39 2007 @@ -12,6 +12,9 @@ # (WinPcap is used for Cygwin) HAS_PCAP?=1 @@ -8,14 +8,14 @@ +HAS_POSIX_MEMALIGN?=0 + # Current dynamips release - VERSION=0.2.5 - VERSION_DEV=$(VERSION)-$(shell date +%Y%m%d-%H) -@@ -30,15 +33,16 @@ + VERSION_TRAIN=0.2.7 + VERSION_SUB= +@@ -34,16 +37,17 @@ -DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" \ -DARCH_INC_FILE=$(ARCH_INC_FILE) -DDYNAMIPS_VERSION=\"$(VERSION)\" \ - -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \ + -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \ - -DHAS_RFC2553=$(HAS_RFC2553) -+ -DHAS_RFC2553=$(HAS_RFC2553) -DHAS_POSIX_MEMALIGN=$(HAS_POSIX_MEMALIGN) ++ -DHAS_RFC2553=$(HAS_RFC2553) -DHAS_POSIX_MEMALIGN=$(HAS_POSIX_MEMALIGN) -PCAP_LIB=/usr/local/lib/libpcap.a -#PCAP_LIB=-lpcap @@ -24,11 +24,12 @@ ifeq ($(shell uname), FreeBSD) PTHREAD_LIBS?=-pthread -- CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf $(PTHREAD_CFLAGS) -- LIBS=-L/usr/local/lib -L. -lelf $(PTHREAD_LIBS) +- CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf $(PTHREAD_CFLAGS) \ + LOCALBASE?=/usr/local -+ CFLAGS+=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/libelf $(PTHREAD_CFLAGS) ++ CFLAGS+=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/libelf $(PTHREAD_CFLAGS) \ + -D_FILE_OFFSET_BITS=64 +- LIBS=-L/usr/local/lib -L. -lelf $(PTHREAD_LIBS) + LIBS=-L$(LOCALBASE)/lib -L. -lelf $(PTHREAD_LIBS) $(LDFLAGS) else - ifeq ($(shell uname -s), Darwin) - CFLAGS+=-I/usr/local/include -mdynamic-no-pic + ifeq ($(shell uname), Linux) + PTHREAD_LIBS?=-lpthread |