From fad089ffff6cc8dd3d2f70397f6e4054372fe6f0 Mon Sep 17 00:00:00 2001 From: Xianyi Zhang Date: Thu, 5 Apr 2012 16:21:40 +0800 Subject: [PATCH] Fixed #84 the MD5 command line bug on Mac OSX. --- Makefile | 13 +++++++++++-- Makefile.system | 4 ++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ba04aa989..afa8d2efb 100644 --- a/Makefile +++ b/Makefile @@ -232,18 +232,27 @@ endif lapack-3.4.0 : lapack-3.4.0.tgz ifndef NOFORTRAN +ifndef NO_LAPACK @if test `$(MD5SUM) lapack-3.4.0.tgz | $(AWK) '{print $$1}'` = 02d5706ec03ba885fc246e5fa10d8c70; then \ echo $(TAR) zxf $< ;\ $(TAR) zxf $< && (cd lapack-3.4.0; $(PATCH) -p1 < ../patch.for_lapack-3.4.0) ;\ else \ - echo " lapack-3.4.0.tgz check sum is wrong (Please use orignal)." ;\ rm -rf lapack-3.4.0 ;\ + echo " Cannot download lapack-3.4.0.tgz or the MD5 check sum is wrong (Please use orignal)."; \ + exit 1; \ fi endif +endif + +LAPACK_URL=http://www.netlib.org/lapack/lapack-3.4.0.tgz lapack-3.4.0.tgz : ifndef NOFORTRAN - -wget http://www.netlib.org/lapack/lapack-3.4.0.tgz +ifeq ($(OSNAME), Darwin) + curl -O $(LAPACK_URL) +else + wget $(LAPACK_URL) +endif endif large.tgz : diff --git a/Makefile.system b/Makefile.system index 0fd223d60..bbd31e5ca 100644 --- a/Makefile.system +++ b/Makefile.system @@ -101,6 +101,7 @@ DLLWRAP = $(CROSS_SUFFIX)dllwrap ifeq ($(OSNAME), Darwin) export MACOSX_DEPLOYMENT_TARGET=10.2 +MD5SUM = md5 -r endif ifeq ($(OSNAME), Linux) @@ -651,7 +652,10 @@ PATCH = patch GREP = grep endif +ifndef MD5SUM MD5SUM = md5sum +endif + AWK = awk REVISION = -r$(VERSION)