From b8b922d334568ea2cf5d7c471be187715ddfb33f Mon Sep 17 00:00:00 2001 From: Xianyi Zhang Date: Wed, 20 Jun 2012 11:07:36 +0800 Subject: [PATCH 1/2] Fixed #106. Use fetch instead of curl on FreeBSD. --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 905d686a2..796217291 100644 --- a/Makefile +++ b/Makefile @@ -257,12 +257,16 @@ LAPACK_URL=http://www.netlib.org/lapack/lapack-3.4.1.tgz lapack-3.4.1.tgz : ifndef NOFORTRAN #http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or -ifeq ($(OSNAME), $(filter $(OSNAME),Darwin FreeBSD NetBSD)) +ifeq ($(OSNAME), $(filter $(OSNAME),Darwin NetBSD)) curl -O $(LAPACK_URL) +else +ifeq ($(OSNAME), FreeBSD) + fetch $(LAPACK_URL) else wget $(LAPACK_URL) endif endif +endif large.tgz : ifndef NOFORTRAN From 037d995c4d8c2c5281d9141ce2905f44cc908ac2 Mon Sep 17 00:00:00 2001 From: Zaheer Chothia Date: Tue, 19 Jun 2012 22:05:32 +0200 Subject: [PATCH 2/2] Fixed noisy warning with Clang ../common_thread.h:138:24: warning: equality comparison with extraneous parentheses [-Wparentheses-equality] if ((blas_cpu_number == 1) ~~~~~~~~~~~~~~~~^~~~ ../common_thread.h:138:24: note: remove extraneous parentheses around the comparison to silence this warning if ((blas_cpu_number == 1) ~ ^ ~ ../common_thread.h:138:24: note: use '=' to turn this equality comparison into an assignment if ((blas_cpu_number == 1) ^~ = --- common_thread.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common_thread.h b/common_thread.h index dc963a635..97e060976 100644 --- a/common_thread.h +++ b/common_thread.h @@ -135,7 +135,7 @@ static __inline int num_cpu_avail(int level) { int openmp_nthreads=0; #endif - if ((blas_cpu_number == 1) + if (blas_cpu_number == 1 #ifdef USE_OPENMP || omp_in_parallel()