diff options
author | Brendan Fabeny <bf@FreeBSD.org> | 2011-11-22 11:14:10 +0000 |
---|---|---|
committer | Brendan Fabeny <bf@FreeBSD.org> | 2011-11-22 11:14:10 +0000 |
commit | 004a7c5ac21475f760354371ae4f8fca5e556acb (patch) | |
tree | 47b9539be8bb171263921a641d850025fee218cc /math/lapack++ | |
parent | - Update to 3.6.1 (diff) |
adjust linking and comments in dependent ports after the math/atlas update;
math/atlas-devel will be updated to use the same constructs at a later date
PR: 162706
Approved by: miwi (portmgr)
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=286242
Diffstat (limited to 'math/lapack++')
-rw-r--r-- | math/lapack++/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/math/lapack++/Makefile b/math/lapack++/Makefile index 370e8b9e9fbe..a1d7a3174aba 100644 --- a/math/lapack++/Makefile +++ b/math/lapack++/Makefile @@ -28,7 +28,7 @@ USE_GNOME= gnomehack .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS) +.if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS) WITH_ATLAS= yes .endif .if defined(WITH_ATLAS) @@ -42,15 +42,15 @@ USE_FORTRAN= yes GNU_CONFIGURE= yes USE_GMAKE= yes .if defined(WITH_ATLAS) -BLAS_LIB= -L${LOCALBASE}/lib -lf77blas -latlas -LAPACK_LIB= -L${LOCALBASE}/lib -lalapack +BLAS_LIB= -L${LOCALBASE}/lib -lf77blas +LAPACK_LIB= -L${LOCALBASE}/lib -lalapack -lcblas .else BLAS_LIB= -L${LOCALBASE}/lib -lblas LAPACK_LIB= -L${LOCALBASE}/lib -llapack .endif -#BLAS_LIB= -L${LOCALBASE}/lib -lptf77blas -latlas_r ${PTHREAD_LIBS} -#LAPACK_LIB= -L${LOCALBASE}/lib -lalapack_r -lptcblas ${PTHREAD_LIBS} +#BLAS_LIB= -L${LOCALBASE}/lib -lptf77blas +#LAPACK_LIB= -L${LOCALBASE}/lib -lalapack -lptcblas #lapack++ forces to use atlas when detected, so we should disable here. CONFIGURE_ARGS+= --with-blas="${BLAS_LIB}" --with-lapack="${LAPACK_LIB}" --disable-atlas --enable-static |