diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2007-01-10 08:07:36 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2007-01-10 08:07:36 +0000 |
| commit | 506e651f7d3ebf82be04131c71eff563a2d0dc7c (patch) | |
| tree | cdd788a8a8c40ba0744dfd376293c90dc1a771e5 /math | |
| parent | 8bc8522a4521bac222ef00f1055c42b14bea55ea (diff) | |
| download | ports-506e651f7d3ebf82be04131c71eff563a2d0dc7c.tar.gz ports-506e651f7d3ebf82be04131c71eff563a2d0dc7c.zip | |
Notes
Diffstat (limited to 'math')
| -rw-r--r-- | math/scalapack/Makefile | 15 | ||||
| -rw-r--r-- | math/scalapack/files/SLmake.inc-mpich.diff | 12 |
2 files changed, 20 insertions, 7 deletions
diff --git a/math/scalapack/Makefile b/math/scalapack/Makefile index 2a823369ad26..b1bcd2f2fd57 100644 --- a/math/scalapack/Makefile +++ b/math/scalapack/Makefile @@ -7,6 +7,7 @@ PORTNAME= scalapack PORTVERSION= 1.7.4 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= ftp://ftp.netlib.org/scalapack/ DISTFILES= scalapack-${PORTVERSION}.tgz manpages.tgz @@ -26,7 +27,8 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libblacs.a:${PORTSDIR}/math/blacs \ CONFLICTS= elmer-mathlibs-1* -F77?= f77 +WANT_FORTRAN= yes +USE_GCC= 4.2+ ARCH2FIX= PBLAS/SRC PBLAS/SRC/PBBLAS PBLAS/SRC/PTOOLS PBLAS/SRC/PTZBLAS \ REDIST/SRC SRC TOOLS TOOLS/LAPACK @@ -43,13 +45,12 @@ SUB_FILES= pkg-message .if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS) WITH_ATLAS= yes .endif - .if defined(WITH_ATLAS) -LIB_DEPENDS+= atlas.1:${PORTSDIR}/math/atlas +LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas BLAS= -lf77blas -latlas .else -LIB_DEPENDS+= blas.1:${PORTSDIR}/math/blas -LIB_DEPENDS+= lapack:${PORTSDIR}/math/lapack +LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas +LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack BLAS= -lblas .endif @@ -80,9 +81,9 @@ CFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops .endif post-patch: - ${REINPLACE_CMD} -e 's,@BLAS@,${BLAS},g; s,@WRKSRC@,${WRKSRC},g ; s,@LOCALBASE@,${LOCALBASE},g ; s,@CC@,${CC},g ; s,@CFLAGS@,${CFLAGS},g ; s,@F77@,${F77},g ; s,@FFLAGS@,${FFLAGS},g ; s,@F77EXTRAFLAGS@,${F77EXTRAFLAGS},g ; s,^ARCH *.= ar,ARCMD = ar,' ${WRKSRC}/SLmake.inc + @${REINPLACE_CMD} -e 's,@BLAS@,${BLAS},g; s,@WRKSRC@,${WRKSRC},g ; s,@LOCALBASE@,${LOCALBASE},g ; s,@CC@,${CC},g ; s,@CFLAGS@,${CFLAGS},g ; s,@F77@,${F77},g ; s,@FFLAGS@,${FFLAGS},g ; s,@F77EXTRAFLAGS@,${F77EXTRAFLAGS},g ; s,^ARCH *.= ar,ARCMD = ar,' ${WRKSRC}/SLmake.inc .for mkf in ${ARCH2FIX} - ${REINPLACE_CMD} -e 's|\$$(ARCH)|$$(ARCMD)|' ${WRKSRC}/${mkf}/Makefile + @${REINPLACE_CMD} -e 's|\$$(ARCH)|$$(ARCMD)|' ${WRKSRC}/${mkf}/Makefile .endfor do-build: diff --git a/math/scalapack/files/SLmake.inc-mpich.diff b/math/scalapack/files/SLmake.inc-mpich.diff index b484fadc4a89..e9f389e71d58 100644 --- a/math/scalapack/files/SLmake.inc-mpich.diff +++ b/math/scalapack/files/SLmake.inc-mpich.diff @@ -60,3 +60,15 @@ # PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) + +--- SLmake.inc~ Wed Jan 10 16:50:13 2007 ++++ SLmake.inc Wed Jan 10 16:54:40 2007 +@@ -82,7 +82,7 @@ + # C preprocessor defs for compilation + # (-DNoChange, -DAdd_, -DUpCase, or -Df77IsF2C) + # +-CDEFS = -Df77IsF2C -DNO_IEEE $(USEMPI) ++CDEFS = -DAdd_ -DNO_IEEE $(USEMPI) + # + # The archiver and the flag(s) to use when building archive (library) + # Also the ranlib routine. If your system has no ranlib, set RANLIB = echo |