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/scalapack | |
| 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/scalapack')
| -rw-r--r-- | math/scalapack/Makefile | 4 | ||||
| -rw-r--r-- | math/scalapack/files/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/math/scalapack/Makefile b/math/scalapack/Makefile index 790aaf92a8fe..ee9e417a485e 100644 --- a/math/scalapack/Makefile +++ b/math/scalapack/Makefile @@ -42,12 +42,12 @@ SUB_FILES= pkg-message .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) LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas -BLAS= -lf77blas -latlas +BLAS= -lf77blas LAPACK= -lalapack -lcblas .else LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas diff --git a/math/scalapack/files/Makefile b/math/scalapack/files/Makefile index b8acf5217911..711f068aaa67 100644 --- a/math/scalapack/files/Makefile +++ b/math/scalapack/files/Makefile @@ -5,7 +5,7 @@ all: densg densg2 densg: example1.f # f77 version - mpif77 -o densg example1.f -L/usr/local/lib -lscalapack -lblacs -lblacsf77 -lblacs -lf77blas -latlas + mpif77 -o densg example1.f -L/usr/local/lib -lscalapack -lblacs -lblacsf77 -lblacs -lf77blas densg2: example1.cc # C++ version - mpiCC -o densg2 example1.cc -I/usr/local/mpich/include -I/usr/local/include -L/usr/local/lib -lscalapack -lblacs -lblacsf77 -lblacs -lf77blas -latlas -lg2c -lm + mpiCC -o densg2 example1.cc -I/usr/local/mpich/include -I/usr/local/include -L/usr/local/lib -lscalapack -lblacs -lblacsf77 -lblacs -lf77blas -lg2c -lm |