diff options
author | thierry <thierry@FreeBSD.org> | 2010-11-15 06:00:23 +0800 |
---|---|---|
committer | thierry <thierry@FreeBSD.org> | 2010-11-15 06:00:23 +0800 |
commit | f74dc2634d5f87311c12ad3956d0a1b6c2f1c8d6 (patch) | |
tree | 0eba53bd69baa679ca5c80442ecc9ca3d3c5720b /math | |
parent | 855bb89e825f55e4710bcf5e53f8af2dfabec171 (diff) | |
download | freebsd-ports-gnome-f74dc2634d5f87311c12ad3956d0a1b6c2f1c8d6.tar.gz freebsd-ports-gnome-f74dc2634d5f87311c12ad3956d0a1b6c2f1c8d6.tar.zst freebsd-ports-gnome-f74dc2634d5f87311c12ad3956d0a1b6c2f1c8d6.zip |
Chase the upgrade of MPICH2.
Diffstat (limited to 'math')
-rw-r--r-- | math/mumps/Makefile | 1 | ||||
-rw-r--r-- | math/mumps/files/patch-Make.inc+Makefile.inc.generic | 2 | ||||
-rw-r--r-- | math/petsc/Makefile | 14 | ||||
-rw-r--r-- | math/sdpara/Makefile | 2 |
4 files changed, 14 insertions, 5 deletions
diff --git a/math/mumps/Makefile b/math/mumps/Makefile index 3574b1aa89f2..348cc029f41f 100644 --- a/math/mumps/Makefile +++ b/math/mumps/Makefile @@ -7,6 +7,7 @@ PORTNAME= mumps PORTVERSION= 4.8.4 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://mumps.enseeiht.fr/ \ http://graal.ens-lyon.fr/MUMPS/ \ diff --git a/math/mumps/files/patch-Make.inc+Makefile.inc.generic b/math/mumps/files/patch-Make.inc+Makefile.inc.generic index 7421456b4d47..464e45902abe 100644 --- a/math/mumps/files/patch-Make.inc+Makefile.inc.generic +++ b/math/mumps/files/patch-Make.inc+Makefile.inc.generic @@ -52,7 +52,7 @@ # LIBRARIES USED BY THE PARALLEL VERSION OF MUMPS: $(SCALAP) and MPI -LIBPAR = $(SCALAP) -L/usr/lib -lmpi -+LIBPAR = -L@LOCALBASE@/lib -lfmpich -lmpich $(SCALAP) ++LIBPAR = -L@LOCALBASE@/lib -lfmpich -lmpich -lmpl $(SCALAP) # The parallel version is not concerned by the next two lines. # They are related to the sequential library provided by MUMPS, diff --git a/math/petsc/Makefile b/math/petsc/Makefile index 80ba614cb627..dbcc84d68456 100644 --- a/math/petsc/Makefile +++ b/math/petsc/Makefile @@ -7,7 +7,7 @@ PORTNAME= petsc DISTVERSION= 2.3.3-p0 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= math parallel MASTER_SITES= ftp://ftp.mcs.anl.gov/pub/petsc/release-snapshots/ @@ -28,8 +28,8 @@ CONFIGURE_ENV= PETSC_ARCH=${TARGET} \ PETSC_DIR=${WRKSRC} CONFIGURE_ARGS= --prefix=${PREFIX}/${PFX} --COPTFLAGS="${CFLAGS}" \ --CXXOPTFLAGS="${CXXFLAGS}" --FOPTFLAGS="${FFLAGS}" \ - --with-shared=1 --with-cc=${CC} --with-fc=${FC} \ - --CPPFLAGS="-I${LOCALBASE}/include" + --with-shared=1 --with-cc=${CC} --with-fc=${FC} \ + --CPPFLAGS="-I${LOCALBASE}/include" --LDFLAGS=${PTHREAD_LIBS} ALL_TARGET= all MAKEFILE= makefile MAKE_ENV= PETSC_DIR=${WRKSRC} @@ -258,6 +258,14 @@ pre-configure: ${REINPLACE_CMD} -e "s|/bin/ksh|${LOCALBASE}/bin/ksh|" \ ${WRKSRC}/bin/popup @${RM} ${WRKSRC}/bin/popup.bak +.if defined (WITH_MPI) +. for ps in ml.py MPE.py + ${REINPLACE_CMD} -e "s|-lpmpich|-lmpl|" \ + ${WRKSRC}/python/PETSc/packages/${ps} +. endfor + ${REINPLACE_CMD} -e "s|libpmpich|libmpl|" \ + ${WRKSRC}/python/BuildSystem/config/packages/MPI.py +.endif .if defined(PACKAGE_BUILDING) ${REINPLACE_CMD} -e "s|%%PACKAGE%%exit 1; ||" \ -e "s|%%PACKAGE%%sys.exit(3)||" \ diff --git a/math/sdpara/Makefile b/math/sdpara/Makefile index fc9ba3bf166d..10ab164c1aeb 100644 --- a/math/sdpara/Makefile +++ b/math/sdpara/Makefile @@ -7,7 +7,7 @@ PORTNAME= sdpara PORTVERSION= 7.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math parallel MASTER_SITES= http://sdpa.indsys.chuo-u.ac.jp/sdpa/files/ DISTFILES= ${SRCFILE}#${MANUALFILE} |