diff options
| author | thierry <thierry@FreeBSD.org> | 2010-11-15 06:00:16 +0800 |
|---|---|---|
| committer | thierry <thierry@FreeBSD.org> | 2010-11-15 06:00:16 +0800 |
| commit | cdd6075402dc5ef2665e6c994b24a989bae12cd6 (patch) | |
| tree | be3bb08ebdc50aaf23748edcc061c5fbbcba88e8 /science/mpqc | |
| parent | 6eea3c6df853a3be337a17dc942de21c155982e9 (diff) | |
| download | freebsd-ports-gnome-cdd6075402dc5ef2665e6c994b24a989bae12cd6.tar.gz freebsd-ports-gnome-cdd6075402dc5ef2665e6c994b24a989bae12cd6.tar.zst freebsd-ports-gnome-cdd6075402dc5ef2665e6c994b24a989bae12cd6.zip | |
Chase the upgrade of MPICH2.
PR: ports/151868
Approved by: maho (maintainer)
Diffstat (limited to 'science/mpqc')
| -rw-r--r-- | science/mpqc/Makefile | 3 | ||||
| -rw-r--r-- | science/mpqc/files/patch-::configure.in | 16 |
2 files changed, 15 insertions, 4 deletions
diff --git a/science/mpqc/Makefile b/science/mpqc/Makefile index c2aa8963ea20..1d698b92b558 100644 --- a/science/mpqc/Makefile +++ b/science/mpqc/Makefile @@ -7,7 +7,7 @@ PORTNAME= mpqc PORTVERSION= 2.3.1 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= science parallel MASTER_SITES= SF @@ -74,6 +74,7 @@ CONFIGURE_ARGS+=--with-libs="-lsvml" .if defined(WITH_MPICH) CONFIGURE_ARGS+=--with-libdirs="-L${LOCALBASE}/lib -L${LOCALBASE}/lib"\ --enable-always-use-mpi +CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" .endif .if defined(WITH_MPICH) CONFIGURE_ARGS+=--with-include="-I${LOCALBASE}/include -I${WRKDIR} -I${LOCALBASE}/include" diff --git a/science/mpqc/files/patch-::configure.in b/science/mpqc/files/patch-::configure.in index 5b24e5d404e3..f3d3b70bc7e6 100644 --- a/science/mpqc/files/patch-::configure.in +++ b/science/mpqc/files/patch-::configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig 2006-03-23 03:04:54.000000000 +0900 -+++ configure.in 2007-11-11 14:37:20.000000000 +0900 +--- configure.in.orig 2006-03-22 19:04:54.000000000 +0100 ++++ configure.in 2010-10-28 00:09:59.000000000 +0200 @@ -349,6 +349,31 @@ ac_default_prefix="/usr/local/mpqc/$SC_VERSION" @@ -165,7 +165,17 @@ AC_CHECK_FUNC(pthread_attr_getstacksize) AC_CHECK_FUNC(pthread_attr_setstacksize) AC_CHECK_FUNC(pthread_attr_setscope) -@@ -1769,10 +1793,10 @@ +@@ -1165,7 +1189,8 @@ + AC_CHECK_LIB(mpi,MPI_Init,[HAVE_MPI=yes;LIBS="-lmpi $LIBS"]) + fi + if test "$HAVE_MPI" = no; then +- AC_CHECK_LIB(mpich,MPI_Init,[HAVE_MPI=yes;LIBS="-lmpich $LIBS"]) ++ LIBS="-lmpl $PTHREAD_LIBS $LIBS" ++ AC_CHECK_LIB(mpich,MPI_Init,[HAVE_MPI=yes;LIBS="-lmpich -lmpl $PTHREAD_LIBS $LIBS"]) + fi + fi + if test X$HAVE_MPI = Xyes; then +@@ -1769,10 +1794,10 @@ dnl --------- CCA component configuration --------- |