When upgrading net/mpich2 to 1.3, the ports math/blacs, science/mbdyn & science/mpqc must be modified. Please see the hereunder patches. net/mpich2 upgrade: PR ports/151867 http://www.freebsd.org/cgi/query-pr.cgi?pr=151867 Note about science/mbdyn: I have'nt been able to build it with MPI without enaabling SCHUR. Fix: diff -urN science/mbdyn.orig/Makefile science/mbdyn/Makefile --- science/mbdyn.orig/Makefile 2010-01-01 17:10:49.000000000 +0100 +++ science/mbdyn/Makefile 2010-11-01 15:45:59.000000000 +0100 @@ -7,7 +7,7 @@ PORTNAME= mbdyn PORTVERSION= 1.3.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science MASTER_SITES= http://www.aero.polimi.it/~masarati/Download/mbdyn/ @@ -51,9 +51,12 @@ .if defined(WITH_MPI) LIB_DEPENDS+= mpich:${PORTSDIR}/net/mpich2 -CONFIGURE_ARGS+= --with-mpi=pmpi -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mpi2c++ -LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ARGS+= --with-mpi=yes --enable-schur +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= "-L${LOCALBASE}/lib" +. if !defined(WITH_METIS) +WITH_CHACO= yes +. endif .else CONFIGURE_ARGS+= --with-mpi=no .endif diff -urN science/mbdyn.orig/files/patch-configure science/mbdyn/files/patch-configure --- science/mbdyn.orig/files/patch-configure 2009-08-05 07:25:45.000000000 +0200 +++ science/mbdyn/files/patch-configure 2010-10-31 22:20:11.000000000 +0100 @@ -1,16 +1,5 @@ ---- configure.in 2009-08-05 12:29:39.000000000 +0900 -+++ configure.in 2009-08-05 12:29:50.000000000 +0900 -@@ -765,7 +765,7 @@ - dnl Add fortran lib - dnl - case `basename "$F77"` in --gfortran) -+gfortran*) - F2C_LIBS="$F2C_LIBS -lgfortran" - ;; - *) ---- configure~ 2009-06-24 20:45:44.000000000 +0900 -+++ configure 2009-08-05 12:29:56.000000000 +0900 +--- configure.orig 2009-06-24 13:45:44.000000000 +0200 ++++ configure 2010-10-31 22:17:08.000000000 +0100 @@ -27344,7 +27344,7 @@ fi @@ -20,3 +9,56 @@ F2C_LIBS="$F2C_LIBS -lgfortran" ;; *) +@@ -33508,7 +33508,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default +-#include <$ac_header> ++#include <mpi.h> + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" +@@ -33548,7 +33548,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <$ac_header> ++#include <mpi.h> + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" + case "(($ac_try" in +@@ -33643,7 +33643,7 @@ + elif test $ac_cv_header_mpicxx_h = yes ; then + have_mpi_cxx_header=yes + mpi_cxx_header="mpicxx.h" +- try_mpi_LIBS="-lmpi -lmpi_cxx" ++ try_mpi_LIBS="-lmpich -lmpichcxx -lmpl -pthread" + fi + + if test $ac_cv_header_mpi_h = yes -a $have_mpi_cxx_header = yes ; then +@@ -33655,7 +33655,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +- try_mpi_LIBS= + save_LIBS=$LIBS + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -33664,7 +33663,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-#include <$mpi_cxx_header> ++#include <mpi.h> + + int + main () +@@ -33715,7 +33714,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-#include <mpi_cxx_header> ++#include <mpi.h> + + int + main () diff -urN science/mbdyn.orig/files/patch-include__ac__mpi.h science/mbdyn/files/patch-include__ac__mpi.h --- science/mbdyn.orig/files/patch-include__ac__mpi.h 1970-01-01 01:00:00.000000000 +0100 +++ science/mbdyn/files/patch-include__ac__mpi.h 2010-10-31 22:32:32.000000000 +0100 @@ -0,0 +1,11 @@ +--- ./include/ac/mpi.h.orig 2009-01-04 19:04:54.000000000 +0100 ++++ ./include/ac/mpi.h 2010-10-31 22:31:57.000000000 +0100 +@@ -35,7 +35,7 @@ + #ifdef HAVE_MPI___H + #include <mpi++.h> + #elif defined HAVE_MPICXX_H +-#include <mpicxx.h> ++#include <mpi.h> + #endif /* ! HAVE_MPI___H && ! HAVE_MPICXX_H */ + + #endif /* MPI_H */ diff -urN science/mbdyn.orig/files/patch-mbdyn__base__invsolver.cc science/mbdyn/files/patch-mbdyn__base__invsolver.cc --- science/mbdyn.orig/files/patch-mbdyn__base__invsolver.cc 1970-01-01 01:00:00.000000000 +0100 +++ science/mbdyn/files/patch-mbdyn__base__invsolver.cc 2010-10-31 23:15:16.000000000 +0100 @@ -0,0 +1,12 @@ +--- ./mbdyn/base/invsolver.cc.orig 2009-04-10 13:25:00.000000000 +0200 ++++ ./mbdyn/base/invsolver.cc 2010-10-31 23:14:49.000000000 +0100 +@@ -200,8 +200,8 @@ + } + } + +-#ifdef USE_SCHUR + int mpi_finalize = 0; ++#ifdef USE_SCHUR + + int MyRank = 0; + if (bParallel) { diff -urN science/mbdyn.orig/files/patch-mbdyn__base__solver.cc science/mbdyn/files/patch-mbdyn__base__solver.cc --- science/mbdyn.orig/files/patch-mbdyn__base__solver.cc 2009-08-05 23:44:49.000000000 +0200 +++ science/mbdyn/files/patch-mbdyn__base__solver.cc 2010-10-31 23:38:49.000000000 +0100 @@ -1,5 +1,5 @@ ---- mbdyn/base/solver.cc.orig 2009-06-24 23:13:44.000000000 +0900 -+++ mbdyn/base/solver.cc 2009-08-05 11:32:29.000000000 +0900 +--- mbdyn/base/solver.cc.orig 2009-06-24 16:13:44.000000000 +0200 ++++ mbdyn/base/solver.cc 2010-10-31 23:38:30.000000000 +0100 @@ -109,10 +109,17 @@ }; @@ -18,3 +18,13 @@ extern "C" void mbdyn_really_exit_handler(int signum) +@@ -456,8 +463,8 @@ + } + } + +-#ifdef USE_SCHUR + int mpi_finalize = 0; ++#ifdef USE_SCHUR + + int MyRank = 0; + if (bParallel) { --- mbdyn.diff ends here --- How-To-Repeat: - Upgrade net/mpich2 to 1.3 - see PR ports/151867; - then apply the attached patches.
Responsible Changed From-To: freebsd-ports-bugs->maho Over to maintainer (via the GNATS Auto Assign Tool)
State Changed From-To: open->feedback Please let me know if you accept these patches, so that I could upgrade net/mpich2. Best regards,
State Changed From-To: feedback->open Approved by maho@.
Responsible Changed From-To: maho->thierry Take.
thierry 2010-11-14 22:00:16 UTC FreeBSD ports repository Modified files: math/blacs Makefile math/blacs/files Bmake.inc-mpich.diff science/mbdyn Makefile science/mbdyn/files patch-configure patch-mbdyn__base__solver.cc science/mpqc Makefile science/mpqc/files patch-::configure.in Added files: science/mbdyn/files patch-include__ac__mpi.h patch-mbdyn__base__invsolver.cc Log: Chase the upgrade of MPICH2. PR: ports/151868 Approved by: maho (maintainer) Revision Changes Path 1.26 +4 -5 ports/math/blacs/Makefile 1.4 +1 -1 ports/math/blacs/files/Bmake.inc-mpich.diff 1.23 +7 -4 ports/science/mbdyn/Makefile 1.4 +55 -13 ports/science/mbdyn/files/patch-configure 1.1 +11 -0 ports/science/mbdyn/files/patch-include__ac__mpi.h (new) 1.1 +12 -0 ports/science/mbdyn/files/patch-mbdyn__base__invsolver.cc (new) 1.3 +12 -2 ports/science/mbdyn/files/patch-mbdyn__base__solver.cc 1.59 +2 -1 ports/science/mpqc/Makefile 1.5 +13 -3 ports/science/mpqc/files/patch-::configure.in _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, thanks for the approval!