diff options
Diffstat (limited to 'parallel')
| -rw-r--r-- | parallel/mpi-ch/Makefile | 13 | ||||
| -rw-r--r-- | parallel/mpi-ch/PLIST | 3 | ||||
| -rw-r--r-- | parallel/mpi-ch/distinfo | 16 | ||||
| -rw-r--r-- | parallel/mpi-ch/patches/patch-aa | 32 | ||||
| -rw-r--r-- | parallel/mpi-ch/patches/patch-ac | 25 | ||||
| -rw-r--r-- | parallel/mpi-ch/patches/patch-ad | 12 | ||||
| -rw-r--r-- | parallel/mpi-ch/patches/patch-ae | 50 |
7 files changed, 87 insertions, 64 deletions
diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile index 1e949e1d2fb..df63e62b10e 100644 --- a/parallel/mpi-ch/Makefile +++ b/parallel/mpi-ch/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.56 2008/07/11 01:57:00 obache Exp $ +# $NetBSD: Makefile,v 1.57 2008/12/21 11:41:01 obache Exp $ -DISTNAME= mpich2-1.0.7 -PKGREVISION= 1 +DISTNAME= mpich2-1.0.8 CATEGORIES= parallel -MASTER_SITES= http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/ +MASTER_SITES= http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/1.0.8/ MAINTAINER= asau@inbox.ru HOMEPAGE= http://www.mcs.anl.gov/research/projects/mpich2/ @@ -24,8 +23,10 @@ PKG_SYSCONFSUBDIR= mpich CONFIGURE_ARGS+= --datadir=${PREFIX}/share/${PKGBASE} CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/${PKGBASE} -CONFIGURE_ARGS+= --with-htmldir=${PREFIX}/share/doc/${PKGBASE}/html +CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/${PKGBASE} +CONFIGURE_ARGS+= --htmldir=${PREFIX}/share/doc/${PKGBASE}/html + +CONFIGURE_ARGS+= --disable-f90 USE_TOOLS+= perl:run diff --git a/parallel/mpi-ch/PLIST b/parallel/mpi-ch/PLIST index bd372c4cfbb..f2fea502cc9 100644 --- a/parallel/mpi-ch/PLIST +++ b/parallel/mpi-ch/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2008/07/11 01:57:00 obache Exp $ +@comment $NetBSD: PLIST,v 1.12 2008/12/21 11:41:01 obache Exp $ bin/check_callstack bin/clog2_join bin/clog2_print @@ -794,6 +794,7 @@ share/mpich2/examples/mpe_nolog.conf share/mpich2/examples/mpicc.conf share/mpich2/examples/mpicxx.conf share/mpich2/examples/mpif77.conf +share/mpich2/examples/mpixxx_opts.conf share/mpich2/examples_collchk/Makefile share/mpich2/examples_collchk/Makefile.in share/mpich2/examples_collchk/composite.c diff --git a/parallel/mpi-ch/distinfo b/parallel/mpi-ch/distinfo index 9d66a7c31a5..88595894105 100644 --- a/parallel/mpi-ch/distinfo +++ b/parallel/mpi-ch/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.13 2008/05/29 20:25:53 tnn Exp $ +$NetBSD: distinfo,v 1.14 2008/12/21 11:41:01 obache Exp $ -SHA1 (mpich2-1.0.7.tar.gz) = 39d2734f2504b7c3a5e5ea79fa447913c5fcd177 -RMD160 (mpich2-1.0.7.tar.gz) = d818cd2b3daf173a3e754d9805fdf20d74335122 -Size (mpich2-1.0.7.tar.gz) = 16565875 bytes -SHA1 (patch-aa) = dc0756c27c01715669c066007ff964733213f14c +SHA1 (mpich2-1.0.8.tar.gz) = 41d6f6ce1034ecec5c14fb03592730ae2dd071e5 +RMD160 (mpich2-1.0.8.tar.gz) = 646cf50fbdc60a49809f4d0a6bcaf2835844db1f +Size (mpich2-1.0.8.tar.gz) = 17237476 bytes +SHA1 (patch-aa) = bf2ae82372de78e77891b9cf0d93618ba95ca0c8 SHA1 (patch-ab) = 904c244fb3273dd1c38e0083c443f9a9c9d7e27e -SHA1 (patch-ac) = 813ab9b66055ce009d7ff254a6a81a8422ccffcf -SHA1 (patch-ad) = b63a0877e263fbc30500bf8e3a8f002912726efd -SHA1 (patch-ae) = eb20a1eec5aa7fd173e4652e8c4a6e3475f24e7b +SHA1 (patch-ac) = 6e2d4e66824ea6806e86946feea4bc0ae29eca59 +SHA1 (patch-ad) = f3d63a31cbfd8f2e08254130b6579135f6ab8c67 +SHA1 (patch-ae) = e665c29ef2f19c7683eae790299eb4a21f960898 diff --git a/parallel/mpi-ch/patches/patch-aa b/parallel/mpi-ch/patches/patch-aa index a7acd7af130..86b0b85190f 100644 --- a/parallel/mpi-ch/patches/patch-aa +++ b/parallel/mpi-ch/patches/patch-aa @@ -1,11 +1,19 @@ -$NetBSD: patch-aa,v 1.7 2008/05/29 20:25:53 tnn Exp $ +$NetBSD: patch-aa,v 1.8 2008/12/21 11:41:01 obache Exp $ Fix scripts installation. Install configuration files into example directory. ---- src/env/Makefile.in.orig 2008-04-05 02:03:18.000000000 +0400 -+++ src/env/Makefile.in 2008-04-15 23:58:49.000000000 +0400 -@@ -17,6 +17,7 @@ +--- src/env/Makefile.in.orig 2008-10-24 21:31:50.000000000 +0400 ++++ src/env/Makefile.in 2008-12-20 17:34:39.000000000 +0300 +@@ -9,6 +9,7 @@ + VERBOSE = 1 + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_DATA = @INSTALL_DATA@ + MKDIR_P = @MKDIR_P@ + master_top_srcdir = @master_top_srcdir@ +@@ -18,6 +19,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ @@ -13,7 +21,7 @@ Install configuration files into example directory. sysconfdir = @sysconfdir@ DEFS = @DEFS@ -I. -I${srcdir} CPPFLAGS = @CPPFLAGS@ -@@ -38,6 +39,8 @@ +@@ -39,6 +41,8 @@ INCLUDES = -I../include doc_sources = mpicc.txt mpif77.txt mpicxx.txt mpif90.txt mpiexec.txt @@ -22,15 +30,16 @@ Install configuration files into example directory. .SUFFIXES: .SUFFIXES: .o .lo .c .man .html .latex .txt .c.o: -@@ -114,17 +117,17 @@ +@@ -132,18 +136,18 @@ if [ ! -d ${DESTDIR}${exec_prefix} ] ; then $(MKDIR_P) ${DESTDIR}${exec_prefix} ; fi if [ ! -d ${DESTDIR}${prefix} ] ; then $(MKDIR_P) ${DESTDIR}${prefix} ; fi if [ ! -d ${DESTDIR}${bindir} ] ; then $(MKDIR_P) ${DESTDIR}${bindir} ; fi - $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpicc ${DESTDIR}${bindir}/mpicc -+ $(BSD_INSTALL_SCRIPT) mpicc ${DESTDIR}${bindir}/mpicc ++ $(INSTALL_SCRIPT) mpicc ${DESTDIR}${bindir}/mpicc $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpich2version ${DESTDIR}${bindir}/mpich2version - $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) parkill ${DESTDIR}${bindir}/parkill - if [ ! -d ${DESTDIR}${sysconfdir} ] ; then $(MKDIR_P) ${DESTDIR}${sysconfdir} ; fi +- $(INSTALL_DATA) mpixxx_opts.conf ${DESTDIR}${sysconfdir}/mpixxx_opts.conf - $(INSTALL_DATA) mpicc.conf ${DESTDIR}${sysconfdir}/mpicc.conf - if [ -s mpicxx ] ; then $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpicxx ${DESTDIR}${bindir}/mpicxx ; fi - if [ -s mpif77 ] ; then $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpif77 ${DESTDIR}${bindir}/mpif77 ; fi @@ -38,12 +47,13 @@ Install configuration files into example directory. - if [ -s mpicxx.conf ] ; then $(INSTALL_DATA) mpicxx.conf ${DESTDIR}${sysconfdir}/mpicxx.conf ; fi - if [ -s mpif77.conf ] ; then $(INSTALL_DATA) mpif77.conf ${DESTDIR}${sysconfdir}/mpif77.conf ; fi - if [ -s mpif90.conf ] ; then $(INSTALL_DATA) mpif90.conf ${DESTDIR}${sysconfdir}/mpif90.conf ; fi -+ $(BSD_INSTALL_SCRIPT) parkill ${DESTDIR}${bindir}/parkill ++ $(INSTALL_SCRIPT) parkill ${DESTDIR}${bindir}/parkill + if [ ! -d ${DESTDIR}${exampledir} ] ; then $(MKDIR_P) ${DESTDIR}${exampledir} ; fi ++ $(INSTALL_DATA) mpixxx_opts.conf ${DESTDIR}${exampledir}/mpixxx_opts.conf + $(INSTALL_DATA) mpicc.conf ${DESTDIR}${exampledir}/mpicc.conf -+ if [ -s mpicxx ] ; then $(BSD_INSTALL_SCRIPT) mpicxx ${DESTDIR}${bindir}/mpicxx ; fi -+ if [ -s mpif77 ] ; then $(BSD_INSTALL_SCRIPT) mpif77 ${DESTDIR}${bindir}/mpif77 ; fi -+ if [ -s mpif90 ] ; then $(BSD_INSTALL_SCRIPT) mpif90 ${DESTDIR}${bindir}/mpif90 ; fi ++ if [ -s mpicxx ] ; then $(INSTALL_SCRIPT) mpicxx ${DESTDIR}${bindir}/mpicxx ; fi ++ if [ -s mpif77 ] ; then $(INSTALL_SCRIPT) mpif77 ${DESTDIR}${bindir}/mpif77 ; fi ++ if [ -s mpif90 ] ; then $(INSTALL_SCRIPT) mpif90 ${DESTDIR}${bindir}/mpif90 ; fi + if [ -s mpicxx.conf ] ; then $(INSTALL_DATA) mpicxx.conf ${DESTDIR}${exampledir}/mpicxx.conf ; fi + if [ -s mpif77.conf ] ; then $(INSTALL_DATA) mpif77.conf ${DESTDIR}${exampledir}/mpif77.conf ; fi + if [ -s mpif90.conf ] ; then $(INSTALL_DATA) mpif90.conf ${DESTDIR}${exampledir}/mpif90.conf ; fi diff --git a/parallel/mpi-ch/patches/patch-ac b/parallel/mpi-ch/patches/patch-ac index ace2fc31aa7..21fd4e659b5 100644 --- a/parallel/mpi-ch/patches/patch-ac +++ b/parallel/mpi-ch/patches/patch-ac @@ -1,19 +1,30 @@ -$NetBSD: patch-ac,v 1.5 2008/05/29 20:25:54 tnn Exp $ +$NetBSD: patch-ac,v 1.6 2008/12/21 11:41:01 obache Exp $ Install sample configuration files in example directory. ---- src/mpe2/sbin/mpeinstall.in.orig 2007-11-29 00:51:40.000000000 +0300 -+++ src/mpe2/sbin/mpeinstall.in 2008-04-16 00:32:18.000000000 +0400 -@@ -38,6 +38,8 @@ - htmldir=@htmldir@ - docdir=@docdir@ +--- src/mpe2/sbin/mpeinstall.in.orig 2008-10-24 20:56:05.000000000 +0400 ++++ src/mpe2/sbin/mpeinstall.in 2008-12-20 18:17:51.000000000 +0300 +@@ -40,13 +40,15 @@ + mandir=@mandir@ + # Since autoconf < 2.60 does not set docdir and htmldir, + # check if they are set. If not, set them accordingly. +-if [ "$docdir" = "@docdir@" ] ; then +- docdir=${datadir}/doc/${PACKAGE} ++if [ "$docdir" = "@docdir@" ] ; then # don't override what we set. ++# docdir=${datadir}/doc/${PACKAGE} + fi +-if [ "$htmldir" = "@htmldir@" ] ; then +- htmldir=${docdir} ++if [ "$htmldir" = "@htmldir@" ] ; then # don't override what we set. ++# htmldir=${docdir} + fi +exampledir=${datadir}/examples + # Assume PROF_LIBNAME=MPE_LIBNAME. PROF_LIBNAME=@MPE_LIBNAME@ MPI_IMPL=@MPI_IMPL@ -@@ -466,10 +468,10 @@ +@@ -493,10 +495,10 @@ if [ -n "$etcbuild_dir" ] ; then if [ -d $etcbuild_dir ] ; then echo "Installing $pkgname configuration files to $DESTDIR$sysconfdir" diff --git a/parallel/mpi-ch/patches/patch-ad b/parallel/mpi-ch/patches/patch-ad index 63af1c068cc..d285062009a 100644 --- a/parallel/mpi-ch/patches/patch-ad +++ b/parallel/mpi-ch/patches/patch-ad @@ -1,15 +1,15 @@ -$NetBSD: patch-ad,v 1.4 2008/05/29 20:25:54 tnn Exp $ +$NetBSD: patch-ad,v 1.5 2008/12/21 11:41:01 obache Exp $ "test ==" portability fix. ---- configure.orig Thu May 15 12:20:15 2008 -+++ configure Thu May 15 12:26:13 2008 -@@ -30782,7 +30782,7 @@ +--- configure.orig 2008-12-20 17:29:37.000000000 +0300 ++++ configure 2008-12-20 17:45:09.000000000 +0300 +@@ -32974,7 +32974,7 @@ ;; esac - if test "$cpu_gcc_x86_cycle" == "no" ; then + if test "$cpu_gcc_x86_cycle" = "no" ; then - { { echo "$as_me:$LINENO: error: Linux86 cycle counter is not available on this system and or with the $CC compiler" >&5 - echo "$as_me: error: Linux86 cycle counter is not available on this system and or with the $CC compiler" >&2;} + { { $as_echo "$as_me:$LINENO: error: Linux86 cycle counter is not available on this system and or with the $CC compiler" >&5 + $as_echo "$as_me: error: Linux86 cycle counter is not available on this system and or with the $CC compiler" >&2;} { (exit 1); exit 1; }; } diff --git a/parallel/mpi-ch/patches/patch-ae b/parallel/mpi-ch/patches/patch-ae index 5454a0212ad..d8569c18f19 100644 --- a/parallel/mpi-ch/patches/patch-ae +++ b/parallel/mpi-ch/patches/patch-ae @@ -1,60 +1,60 @@ -$NetBSD: patch-ae,v 1.4 2008/05/29 20:25:54 tnn Exp $ +$NetBSD: patch-ae,v 1.5 2008/12/21 11:41:01 obache Exp $ "test ==" portability fixes. ---- src/mpid/ch3/channels/nemesis/configure.orig Sat Apr 5 02:04:06 2008 -+++ src/mpid/ch3/channels/nemesis/configure Thu May 15 12:29:54 2008 -@@ -3249,7 +3249,7 @@ +--- src/mpid/ch3/channels/nemesis/configure.orig 2008-12-20 17:29:37.000000000 +0300 ++++ src/mpid/ch3/channels/nemesis/configure 2008-12-20 17:41:34.000000000 +0300 +@@ -3790,7 +3790,7 @@ fi - fi; + -if test "${nemesis_network}" == "gm" ; then +if test "${nemesis_network}" = "gm" ; then ac_safe=`echo "gm.h" | sed 'y%./+-%__p_%'` - echo "$as_me:$LINENO: checking for gm.h" >&5 - echo $ECHO_N "checking for gm.h... $ECHO_C" >&6 -@@ -3444,7 +3444,7 @@ + { $as_echo "$as_me:$LINENO: checking for gm.h" >&5 + $as_echo_n "checking for gm.h... " >&6; } +@@ -3989,7 +3989,7 @@ fi - fi; + -if test "${nemesis_network}" == "ib" ; then +if test "${nemesis_network}" = "ib" ; then ac_safe=`echo "verbs.h" | sed 'y%./+-%__p_%'` - echo "$as_me:$LINENO: checking for verbs.h" >&5 - echo $ECHO_N "checking for verbs.h... $ECHO_C" >&6 -@@ -3639,7 +3639,7 @@ + { $as_echo "$as_me:$LINENO: checking for verbs.h" >&5 + $as_echo_n "checking for verbs.h... " >&6; } +@@ -4188,7 +4188,7 @@ fi - fi; + -if test "${nemesis_network}" == "mx" ; then +if test "${nemesis_network}" = "mx" ; then ac_safe=`echo "myriexpress.h" | sed 'y%./+-%__p_%'` - echo "$as_me:$LINENO: checking for myriexpress.h" >&5 - echo $ECHO_N "checking for myriexpress.h... $ECHO_C" >&6 -@@ -3844,7 +3844,7 @@ + { $as_echo "$as_me:$LINENO: checking for myriexpress.h" >&5 + $as_echo_n "checking for myriexpress.h... " >&6; } +@@ -4397,7 +4397,7 @@ fi - fi; + -if test "${nemesis_network}" == "elan" ; then +if test "${nemesis_network}" = "elan" ; then echo "=== You're about to use the experimental Nemesis/Elan network module." echo "=== This module has not been thoroughly tested and some performance issues remain." -@@ -4042,7 +4042,7 @@ +@@ -4599,7 +4599,7 @@ fi - fi; + -if test "${nemesis_network}" == "sctp" ; then +if test "${nemesis_network}" = "sctp" ; then ac_safe=`echo "netinet/sctp.h" | sed 'y%./+-%__p_%'` - echo "$as_me:$LINENO: checking for netinet/sctp.h" >&5 - echo $ECHO_N "checking for netinet/sctp.h... $ECHO_C" >&6 -@@ -4237,7 +4237,7 @@ + { $as_echo "$as_me:$LINENO: checking for netinet/sctp.h" >&5 + $as_echo_n "checking for netinet/sctp.h... " >&6; } +@@ -4798,7 +4798,7 @@ fi - fi; + -if test "${nemesis_network}" == "psm" ; then +if test "${nemesis_network}" = "psm" ; then ac_safe=`echo "psm.h" | sed 'y%./+-%__p_%'` - echo "$as_me:$LINENO: checking for psm.h" >&5 - echo $ECHO_N "checking for psm.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for psm.h" >&5 + $as_echo_n "checking for psm.h... " >&6; } |