Upgrade to 1.1.1.

Changelog at
<https://svn.mcs.anl.gov/repos/mpi/mpich2/tags/release/mpich2-1.1.1/CHANGES>
This commit is contained in:
Thierry Thomas 2009-07-22 21:22:44 +00:00
parent 3930aaeae2
commit ea05d11e52
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=238225
5 changed files with 90 additions and 96 deletions

View file

@ -6,7 +6,7 @@
#
PORTNAME= mpich2
PORTVERSION= 1.1
PORTVERSION= 1.1.1
PORTEPOCH= 3
CATEGORIES= net parallel
MASTER_SITES= http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${PORTVERSION}/
@ -33,12 +33,17 @@ USE_PERL5_BUILD=yes
USE_GNOME= pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-romio --enable-sharedlibs=gcc
CONFIGURE_ARGS= --enable-romio --enable-sharedlibs=gcc \
--docdir=${DOCSDIR}
CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lexecinfo ${PTHREAD_LIBS}"
LDFLAGS="-L${LOCALBASE}/lib -lexecinfo ${PTHREAD_LIBS}" \
PACKAGE=${PORTNAME}
FFLAGS?= -O2
NOCCACHE= yes
MAKE_ENV= CCACHE_DISABLE=yes
MAKE_ENV= CCACHE_DISABLE=yes PACKAGE=${PORTNAME}
.if defined(WITH_DEBUG)
MAKE_ENV+= VERBOSE=1
.endif
USE_FORTRAN= yes
F90FLAGS+= ${FFLAGS}
@ -83,7 +88,9 @@ LIBSSO= fmpich mpich mpichcxx
THREAD2FIX= configure test/mpi/threads/comm/Makefile.in \
test/mpi/threads/pt2pt/Makefile.in \
src/mpe2/src/logging/configure
src/mpe2/src/logging/configure \
src/mpi/romio/configure src/openpa/configure \
src/pm/hydra/configure
LOCALBASE2FIX= src/mpe2/src/slog2sdk/trace_rlog/configure \
src/mpe2/src/slog2sdk/trace_sample/configure \
src/mpe2/src/graphics/configure

View file

@ -1,3 +1,3 @@
MD5 (mpich/mpich2-1.1.tar.gz) = aad757e1c1502429170403bb3c1a1ace
SHA256 (mpich/mpich2-1.1.tar.gz) = 205b6e46e30620351d3c11281b435367b3d5fc46aae56f0dc9aa32443f7a2f6b
SIZE (mpich/mpich2-1.1.tar.gz) = 18227764
MD5 (mpich/mpich2-1.1.1.tar.gz) = 5871194d515eaf6161bbf33052b74d1b
SHA256 (mpich/mpich2-1.1.1.tar.gz) = 481e624cf194774691413348280adab16c4413c439d83044d797c50fc6a61242
SIZE (mpich/mpich2-1.1.1.tar.gz) = 18330566

View file

@ -1,11 +1,11 @@
--- ./configure.orig 2009-06-03 03:49:17.000000000 +0200
+++ ./configure 2009-06-23 19:16:46.000000000 +0200
@@ -36119,12 +36119,12 @@
--- configure.orig 2009-07-21 23:48:05.000000000 +0200
+++ configure 2009-07-22 18:53:59.000000000 +0200
@@ -36096,12 +36096,12 @@
return 0;
}
_ACEOF
-for ac_lib in '' pthread; do
+for ac_lib in '' $PTHREAD_LIBS; do
-for ac_lib in '' thread; do
+for ac_lib in '' -lpthread; do
if test -z "$ac_lib"; then
ac_res="none required"
else
@ -16,27 +16,3 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
@@ -36248,11 +36248,11 @@
{ $as_echo "$as_me:$LINENO: result: $pac_cv_lib_pthread_broken" >&5
$as_echo "$pac_cv_lib_pthread_broken" >&6; }
if test "$pac_cv_lib_pthread_broken" = yes ; then
- # Try again with -lpthread
+ # Try again with pthread
{ $as_echo "$as_me:$LINENO: checking whether pthread routines with explicit lib are broken" >&5
-$as_echo_n "checking whether pthread routines with explicit lib are broken... " >&6; }
+$as_echo_n "checking whether $PTHREAD_LIBS routines with explicit lib are broken... " >&6; }
saveLIBS=$LIBS
- LIBS="$LIBS -lpthread"
+ LIBS="$LIBS $PTHREAD_LIBS"
if test "$cross_compiling" = yes; then
pac_cv_lib_pthread_broken_explicit=unknown
else
@@ -36608,7 +36608,7 @@
_ACEOF
fi
- THR_LIBS="$THR_LIBS -lpthread"
+ THR_LIBS="$THR_LIBS $PTHREAD_LIBS"
MPICH2_THREAD_PACKAGE=pthreads
;;
solaris)

View file

@ -1,22 +1,28 @@
--- ./src/openpa/Makefile.in.orig 2009-06-03 03:50:27.000000000 +0200
+++ ./src/openpa/Makefile.in 2009-06-26 20:57:38.000000000 +0200
@@ -214,13 +214,13 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
--- ./src/openpa/Makefile.in.orig 2009-07-21 23:48:43.000000000 +0200
+++ ./src/openpa/Makefile.in 2009-07-22 18:57:27.000000000 +0200
@@ -260,16 +260,16 @@
$(am__aclocal_m4_deps):
install-dist_docDATA: $(dist_doc_DATA)
@$(NORMAL_INSTALL)
- test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
- @list='$(dist_doc_DATA)'; for p in $$list; do \
- @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
- $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
- done
+%%PORTDOCS%% test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+%%PORTDOCS%% @list='$(dist_doc_DATA)'; for p in $$list; do \
+%%PORTDOCS%% @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
+%%PORTDOCS%% for p in $$list; do \
+%%PORTDOCS%% if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+%%PORTDOCS%% f=$(am__strip_dir) \
+%%PORTDOCS%% echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+%%PORTDOCS%% $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+%%PORTDOCS%% echo "$$d$$p"; \
+%%PORTDOCS%% done | $(am__base_list) | \
+%%PORTDOCS%% while read files; do \
+%%PORTDOCS%% echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
+%%PORTDOCS%% $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
+%%PORTDOCS%% done
uninstall-dist_docDATA:

View file

@ -77,6 +77,7 @@ bin/clog2_repair
%%PM_MPD%%bin/mpdtrace.pyo
bin/mpecc.in
bin/mpefc.in
bin/mpic++
bin/mpicc
bin/mpich2version
bin/mpicxx
@ -147,6 +148,10 @@ include/primitives/opa_by_lock.h
include/primitives/opa_emulated.h
include/primitives/opa_gcc_ia64.h
include/primitives/opa_gcc_intel_32_64.h
include/primitives/opa_gcc_intel_32_64_barrier.h
include/primitives/opa_gcc_intel_32_64_ops.h
include/primitives/opa_gcc_intel_32_64_p3.h
include/primitives/opa_gcc_intel_32_64_p3barrier.h
include/primitives/opa_gcc_intrinsics.h
include/primitives/opa_gcc_ppc.h
include/primitives/opa_gcc_sicortex.h
@ -702,53 +707,53 @@ sbin/mpeuninstall
%%PORTDOCS%%%%DOCSDIR%%/www4/MPE_TagsEnd.html
%%PORTDOCS%%%%DOCSDIR%%/www4/MPE_Update.html
%%PORTDOCS%%%%DOCSDIR%%/www4/libmpe.cit
share/examples_collchk/Makefile
share/examples_collchk/Makefile.in
share/examples_collchk/composite.c
share/examples_collchk/scatterv.c
share/examples_collchk/time_allreduce.c
share/examples_collchk/time_alltoallv.c
share/examples_collchk/time_alltoallv0.c
share/examples_collchk/time_bcast.c
share/examples_collchk/wrong_composite.c
share/examples_collchk/wrong_int_byte.c
share/examples_collchk/wrong_reals.f
share/examples_collchk/wrong_root.c
share/examples_collchk/wrong_scatterv.c
%%X11%%share/examples_graphics/Makefile
%%X11%%share/examples_graphics/Makefile.in
%%X11%%share/examples_graphics/cpi.c
%%X11%%share/examples_graphics/cxgraphics.c
%%X11%%share/examples_graphics/fxgraphics.f
share/examples_logging/Makefile
share/examples_logging/Makefile.in
share/examples_logging/comm1_isr.c
share/examples_logging/comm1_isr_loop.c
share/examples_logging/comm2_connect_accept.c
share/examples_logging/comm2_spawn_child.c
share/examples_logging/comm2_spawn_parent.c
share/examples_logging/cpi.c
share/examples_logging/cpilog.c
share/examples_logging/cpilog_pack.c
share/examples_logging/fcomm1_isr.f
share/examples_logging/fpilog.f
share/examples_logging/fpilog_pack.F
share/examples_logging/iotest.c
share/examples_logging/log_cost.c
share/examples_logging/openmp_mpilog.F
share/examples_logging/openmp_sendrecv.c
share/examples_logging/pthread_allreduce.c
share/examples_logging/pthread_sendrecv.c
share/examples_logging/pthread_sendrecv_user.c
share/examples_logging/srtest.c
%%JAVA%%share/logfiles/barrier.rlog
%%JAVA%%share/logfiles/fpilog.clog
%%JAVA%%share/logfiles/fpilog.slog2
share/mpich2.module
%%JAVA%%@dirrm share/logfiles
@dirrm share/examples_logging
%%X11%%@dirrm share/examples_graphics
@dirrm share/examples_collchk
%%DATADIR%%/examples_collchk/Makefile
%%DATADIR%%/examples_collchk/Makefile.in
%%DATADIR%%/examples_collchk/composite.c
%%DATADIR%%/examples_collchk/scatterv.c
%%DATADIR%%/examples_collchk/time_allreduce.c
%%DATADIR%%/examples_collchk/time_alltoallv.c
%%DATADIR%%/examples_collchk/time_alltoallv0.c
%%DATADIR%%/examples_collchk/time_bcast.c
%%DATADIR%%/examples_collchk/wrong_composite.c
%%DATADIR%%/examples_collchk/wrong_int_byte.c
%%DATADIR%%/examples_collchk/wrong_reals.f
%%DATADIR%%/examples_collchk/wrong_root.c
%%DATADIR%%/examples_collchk/wrong_scatterv.c
%%X11%%%%DATADIR%%/examples_graphics/Makefile
%%X11%%%%DATADIR%%/examples_graphics/Makefile.in
%%X11%%%%DATADIR%%/examples_graphics/cpi.c
%%X11%%%%DATADIR%%/examples_graphics/cxgraphics.c
%%X11%%%%DATADIR%%/examples_graphics/fxgraphics.f
%%DATADIR%%/examples_logging/Makefile
%%DATADIR%%/examples_logging/Makefile.in
%%DATADIR%%/examples_logging/comm1_isr.c
%%DATADIR%%/examples_logging/comm1_isr_loop.c
%%DATADIR%%/examples_logging/comm2_connect_accept.c
%%DATADIR%%/examples_logging/comm2_spawn_child.c
%%DATADIR%%/examples_logging/comm2_spawn_parent.c
%%DATADIR%%/examples_logging/cpi.c
%%DATADIR%%/examples_logging/cpilog.c
%%DATADIR%%/examples_logging/cpilog_pack.c
%%DATADIR%%/examples_logging/fcomm1_isr.f
%%DATADIR%%/examples_logging/fpilog.f
%%DATADIR%%/examples_logging/fpilog_pack.F
%%DATADIR%%/examples_logging/iotest.c
%%DATADIR%%/examples_logging/log_cost.c
%%DATADIR%%/examples_logging/openmp_mpilog.F
%%DATADIR%%/examples_logging/openmp_sendrecv.c
%%DATADIR%%/examples_logging/pthread_allreduce.c
%%DATADIR%%/examples_logging/pthread_sendrecv.c
%%DATADIR%%/examples_logging/pthread_sendrecv_user.c
%%DATADIR%%/examples_logging/srtest.c
%%JAVA%%%%DATADIR%%/logfiles/barrier.rlog
%%JAVA%%%%DATADIR%%/logfiles/fpilog.clog
%%JAVA%%%%DATADIR%%/logfiles/fpilog.slog2
%%JAVA%%@dirrm %%DATADIR%%/logfiles
@dirrm %%DATADIR%%/examples_logging
%%X11%%@dirrm %%DATADIR%%/examples_graphics
@dirrm %%DATADIR%%/examples_collchk
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/www4
%%PORTDOCS%%@dirrm %%DOCSDIR%%/www3
%%PORTDOCS%%@dirrm %%DOCSDIR%%/www1