Merge branch 'develop' into sandybridge

This commit is contained in:
Xianyi Zhang 2012-04-05 16:25:57 +08:00
commit 910338f071
3 changed files with 16 additions and 3 deletions

View File

@ -1,4 +1,4 @@
Copyright (c) 2011, Lab of Parallel Software and Computational Science,ICSAS Copyright (c) 2011,2012 Lab of Parallel Software and Computational Science,ISCAS
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without

View File

@ -232,18 +232,27 @@ endif
lapack-3.4.0 : lapack-3.4.0.tgz lapack-3.4.0 : lapack-3.4.0.tgz
ifndef NOFORTRAN ifndef NOFORTRAN
ifndef NO_LAPACK
@if test `$(MD5SUM) lapack-3.4.0.tgz | $(AWK) '{print $$1}'` = 02d5706ec03ba885fc246e5fa10d8c70; then \ @if test `$(MD5SUM) lapack-3.4.0.tgz | $(AWK) '{print $$1}'` = 02d5706ec03ba885fc246e5fa10d8c70; then \
echo $(TAR) zxf $< ;\ echo $(TAR) zxf $< ;\
$(TAR) zxf $< && (cd lapack-3.4.0; $(PATCH) -p1 < ../patch.for_lapack-3.4.0) ;\ $(TAR) zxf $< && (cd lapack-3.4.0; $(PATCH) -p1 < ../patch.for_lapack-3.4.0) ;\
else \ else \
echo " lapack-3.4.0.tgz check sum is wrong (Please use orignal)." ;\
rm -rf lapack-3.4.0 ;\ 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 fi
endif endif
endif
LAPACK_URL=http://www.netlib.org/lapack/lapack-3.4.0.tgz
lapack-3.4.0.tgz : lapack-3.4.0.tgz :
ifndef NOFORTRAN 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 endif
large.tgz : large.tgz :

View File

@ -101,6 +101,7 @@ DLLWRAP = $(CROSS_SUFFIX)dllwrap
ifeq ($(OSNAME), Darwin) ifeq ($(OSNAME), Darwin)
export MACOSX_DEPLOYMENT_TARGET=10.2 export MACOSX_DEPLOYMENT_TARGET=10.2
MD5SUM = md5 -r
endif endif
ifeq ($(OSNAME), Linux) ifeq ($(OSNAME), Linux)
@ -651,7 +652,10 @@ PATCH = patch
GREP = grep GREP = grep
endif endif
ifndef MD5SUM
MD5SUM = md5sum MD5SUM = md5sum
endif
AWK = awk AWK = awk
REVISION = -r$(VERSION) REVISION = -r$(VERSION)