Sun Nov 4 11:49:40 2018 UTC ()
Update mpich to 3.2.1.

Patch from Eric A. Borisch via pull request.
Closes NetBSD/pkgsrc#38.

Remove patches no longer needed; migrate to configure option for rpath.

===============================================================================
                               Changes in 3.2.1
===============================================================================

 # Fixes for platforms with strict memory alignment requirements.

 # Fixes for MPI_Win info management.

 # Fixed a progress bug with MPI generalized requests.

 # Fixed multiple integer overflow bugs in CH3 and ROMIO.

 # Improved detection for Fortran 2008 binding support.

 # Enhanced support for libfabric (OFI) netmod.

 # Several other minor bug fixes, memory leak fixes, and code cleanup.

   A full list of changes is available at the following link:

     http://git.mpich.org/mpich.git/shortlog/v3.2..v3.2.1


(bsiegert)
diff -r1.85 -r1.86 pkgsrc/parallel/mpi-ch/Makefile
diff -r1.23 -r1.24 pkgsrc/parallel/mpi-ch/PLIST
diff -r1.26 -r1.27 pkgsrc/parallel/mpi-ch/distinfo
diff -r1.3 -r1.4 pkgsrc/parallel/mpi-ch/patches/patch-Makefile.in
cvs diff -r1.85 -r1.86 pkgsrc/parallel/mpi-ch/Makefile (expand / switch to unified diff)

--- pkgsrc/parallel/mpi-ch/Makefile 2018/08/22 09:46:10 1.85
+++ pkgsrc/parallel/mpi-ch/Makefile 2018/11/04 11:49:40 1.86
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.85 2018/08/22 09:46:10 wiz Exp $ 1# $NetBSD: Makefile,v 1.86 2018/11/04 11:49:40 bsiegert Exp $
2 2
3DISTNAME= mpich-3.2 3DISTNAME= mpich-3.2.1
4PKGREVISION= 1 
5CATEGORIES= parallel 4CATEGORIES= parallel
6MASTER_SITES= http://www.mpich.org/static/tarballs/${PKGVERSION_NOREV}/ 5MASTER_SITES= http://www.mpich.org/static/tarballs/${PKGVERSION_NOREV}/
7 6
8MAINTAINER= asau@inbox.ru 7MAINTAINER= asau@inbox.ru
9HOMEPAGE= http://www.mpich.org/ 8HOMEPAGE= http://www.mpich.org/
10COMMENT= Open source MPI, MPI-2, and MPI-3 implementation from Univ. of Chicago 9COMMENT= Open source MPI, MPI-2, and MPI-3 implementation from Univ. of Chicago
11 10
12CONFLICTS+= openmpi-[0-9]* 11CONFLICTS+= openmpi-[0-9]*
13DEPENDS+= bash-[0-9]*:../../shells/bash 12DEPENDS+= bash-[0-9]*:../../shells/bash
14 13
15#MPI_SUBPREFIX= mpich 14#MPI_SUBPREFIX= mpich
16#MPI_PREFIX= ${LOCALBASE}/${MPI_SUBPREFIX} 15#MPI_PREFIX= ${LOCALBASE}/${MPI_SUBPREFIX}
17MPI_PREFIX= ${LOCALBASE} 16MPI_PREFIX= ${LOCALBASE}
@@ -21,29 +20,27 @@ OVERRIDE_DIRDEPTH= 3 @@ -21,29 +20,27 @@ OVERRIDE_DIRDEPTH= 3
21USE_LANGUAGES= c c++ 20USE_LANGUAGES= c c++
22USE_LIBTOOL= yes 21USE_LIBTOOL= yes
23USE_TOOLS+= perl:run 22USE_TOOLS+= perl:run
24GNU_CONFIGURE= yes 23GNU_CONFIGURE= yes
25GNU_CONFIGURE_PREFIX= ${MPI_PREFIX} 24GNU_CONFIGURE_PREFIX= ${MPI_PREFIX}
26CONFIGURE_ARGS+= --datadir=${MPI_PREFIX}/share/${PKGBASE} 25CONFIGURE_ARGS+= --datadir=${MPI_PREFIX}/share/${PKGBASE}
27CONFIGURE_ARGS+= --docdir=${MPI_PREFIX}/share/doc/${PKGBASE} 26CONFIGURE_ARGS+= --docdir=${MPI_PREFIX}/share/doc/${PKGBASE}
28CONFIGURE_ARGS+= --htmldir=${MPI_PREFIX}/share/doc/${PKGBASE}/html 27CONFIGURE_ARGS+= --htmldir=${MPI_PREFIX}/share/doc/${PKGBASE}/html
29CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
30CONFIGURE_ARGS+= --with-hwloc-prefix=${BUILDLINK_PREFIX.hwloc} 29CONFIGURE_ARGS+= --with-hwloc-prefix=${BUILDLINK_PREFIX.hwloc}
31CONFIGURE_ARGS+= --with-openpa-prefix=${BUILDLINK_PREFIX.openpa} 30CONFIGURE_ARGS+= --with-openpa-prefix=${BUILDLINK_PREFIX.openpa}
32CONFIGURE_ARGS+= --with-pm=hydra:gforker 31CONFIGURE_ARGS+= --with-pm=hydra:gforker
33CONFIGURE_ARGS+= --with-thread-package=posix 32CONFIGURE_ARGS+= --with-thread-package=posix
34# Make MPI compiler wrapper usable outside pkgsrc: 33CONFIGURE_ARGS+= --enable-wrapper-rpath
35CONFIGURE_ENV+= WRAPPER_LDFLAGS="-L${MPI_PREFIX}/lib ${COMPILER_RPATH_FLAG}${MPI_PREFIX}/lib" 
36CONFIGURE_ENV+= MPICH_LDFLAGS="-L${MPI_PREFIX}/lib ${COMPILER_RPATH_FLAG}${MPI_PREFIX}/lib" 
37 34
38LDFLAGS+= -lm 35LDFLAGS+= -lm
39 36
40PKG_SYSCONFSUBDIR= mpich 37PKG_SYSCONFSUBDIR= mpich
41 38
42BUILDLINK_PASSTHRU_RPATHDIRS+= ${MPI_PREFIX}/lib 39BUILDLINK_PASSTHRU_RPATHDIRS+= ${MPI_PREFIX}/lib
43 40
44# FreeBSD 6 hack: 41# FreeBSD 6 hack:
45.include "../../mk/bsd.prefs.mk" 42.include "../../mk/bsd.prefs.mk"
46.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" 43.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
47BUILDLINK_TRANSFORM+= rm:-lrt 44BUILDLINK_TRANSFORM+= rm:-lrt
48.endif 45.endif
49 46
cvs diff -r1.23 -r1.24 pkgsrc/parallel/mpi-ch/PLIST (expand / switch to unified diff)

--- pkgsrc/parallel/mpi-ch/PLIST 2017/06/20 17:24:06 1.23
+++ pkgsrc/parallel/mpi-ch/PLIST 2018/11/04 11:49:40 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.23 2017/06/20 17:24:06 adam Exp $ 1@comment $NetBSD: PLIST,v 1.24 2018/11/04 11:49:40 bsiegert Exp $
2bin/hydra_nameserver 2bin/hydra_nameserver
3bin/hydra_persist 3bin/hydra_persist
4bin/hydra_pmi_proxy 4bin/hydra_pmi_proxy
5bin/mpic++ 5bin/mpic++
6bin/mpicc 6bin/mpicc
7bin/mpichversion 7bin/mpichversion
8bin/mpicxx 8bin/mpicxx
9bin/mpiexec 9bin/mpiexec
10bin/mpiexec.gforker 10bin/mpiexec.gforker
11bin/mpiexec.hydra 11bin/mpiexec.hydra
12${PLIST.f90}bin/mpif77 12${PLIST.f90}bin/mpif77
13${PLIST.f90}bin/mpif90 13${PLIST.f90}bin/mpif90
14${PLIST.f90}bin/mpifort 14${PLIST.f90}bin/mpifort
@@ -32,26 +32,27 @@ ${PLIST.f90}lib/libmpichf90.so @@ -32,26 +32,27 @@ ${PLIST.f90}lib/libmpichf90.so
32lib/libmpicxx.la 32lib/libmpicxx.la
33${PLIST.f90}lib/libmpifort.la 33${PLIST.f90}lib/libmpifort.la
34lib/libmpl.so 34lib/libmpl.so
35${PLIST.f90}lib/libopa.so 35${PLIST.f90}lib/libopa.so
36lib/pkgconfig/mpich.pc 36lib/pkgconfig/mpich.pc
37man/man1/hydra_nameserver.1 37man/man1/hydra_nameserver.1
38man/man1/hydra_persist.1 38man/man1/hydra_persist.1
39man/man1/hydra_pmi_proxy.1 39man/man1/hydra_pmi_proxy.1
40man/man1/mpicc.1 40man/man1/mpicc.1
41man/man1/mpicxx.1 41man/man1/mpicxx.1
42man/man1/mpiexec.1 42man/man1/mpiexec.1
43man/man1/mpif77.1 43man/man1/mpif77.1
44man/man1/mpifort.1 44man/man1/mpifort.1
 45man/man3/Constants.3
45man/man3/MPIX_Comm_agree.3 46man/man3/MPIX_Comm_agree.3
46man/man3/MPIX_Comm_failure_ack.3 47man/man3/MPIX_Comm_failure_ack.3
47man/man3/MPIX_Comm_failure_get_acked.3 48man/man3/MPIX_Comm_failure_get_acked.3
48man/man3/MPIX_Comm_revoke.3 49man/man3/MPIX_Comm_revoke.3
49man/man3/MPIX_Comm_shrink.3 50man/man3/MPIX_Comm_shrink.3
50man/man3/MPI_Abort.3 51man/man3/MPI_Abort.3
51man/man3/MPI_Accumulate.3 52man/man3/MPI_Accumulate.3
52man/man3/MPI_Add_error_class.3 53man/man3/MPI_Add_error_class.3
53man/man3/MPI_Add_error_code.3 54man/man3/MPI_Add_error_code.3
54man/man3/MPI_Add_error_string.3 55man/man3/MPI_Add_error_string.3
55man/man3/MPI_Address.3 56man/man3/MPI_Address.3
56man/man3/MPI_Aint_add.3 57man/man3/MPI_Aint_add.3
57man/man3/MPI_Aint_diff.3 58man/man3/MPI_Aint_diff.3
@@ -438,26 +439,27 @@ man/man3/MPI_Win_sync.3 @@ -438,26 +439,27 @@ man/man3/MPI_Win_sync.3
438man/man3/MPI_Win_test.3 439man/man3/MPI_Win_test.3
439man/man3/MPI_Win_unlock.3 440man/man3/MPI_Win_unlock.3
440man/man3/MPI_Win_unlock_all.3 441man/man3/MPI_Win_unlock_all.3
441man/man3/MPI_Win_wait.3 442man/man3/MPI_Win_wait.3
442man/man3/MPI_Wtick.3 443man/man3/MPI_Wtick.3
443man/man3/MPI_Wtime.3 444man/man3/MPI_Wtime.3
444share/doc/mpich/html/index.html 445share/doc/mpich/html/index.html
445share/doc/mpich/html/www1/index.htm 446share/doc/mpich/html/www1/index.htm
446share/doc/mpich/html/www1/mpicc.html 447share/doc/mpich/html/www1/mpicc.html
447share/doc/mpich/html/www1/mpicxx.html 448share/doc/mpich/html/www1/mpicxx.html
448share/doc/mpich/html/www1/mpiexec.html 449share/doc/mpich/html/www1/mpiexec.html
449share/doc/mpich/html/www1/mpif77.html 450share/doc/mpich/html/www1/mpif77.html
450share/doc/mpich/html/www1/mpifort.html 451share/doc/mpich/html/www1/mpifort.html
 452share/doc/mpich/html/www3/Constants.html
451share/doc/mpich/html/www3/MPIX_Comm_agree.html 453share/doc/mpich/html/www3/MPIX_Comm_agree.html
452share/doc/mpich/html/www3/MPIX_Comm_failure_ack.html 454share/doc/mpich/html/www3/MPIX_Comm_failure_ack.html
453share/doc/mpich/html/www3/MPIX_Comm_failure_get_acked.html 455share/doc/mpich/html/www3/MPIX_Comm_failure_get_acked.html
454share/doc/mpich/html/www3/MPIX_Comm_revoke.html 456share/doc/mpich/html/www3/MPIX_Comm_revoke.html
455share/doc/mpich/html/www3/MPIX_Comm_shrink.html 457share/doc/mpich/html/www3/MPIX_Comm_shrink.html
456share/doc/mpich/html/www3/MPI_Abort.html 458share/doc/mpich/html/www3/MPI_Abort.html
457share/doc/mpich/html/www3/MPI_Accumulate.html 459share/doc/mpich/html/www3/MPI_Accumulate.html
458share/doc/mpich/html/www3/MPI_Add_error_class.html 460share/doc/mpich/html/www3/MPI_Add_error_class.html
459share/doc/mpich/html/www3/MPI_Add_error_code.html 461share/doc/mpich/html/www3/MPI_Add_error_code.html
460share/doc/mpich/html/www3/MPI_Add_error_string.html 462share/doc/mpich/html/www3/MPI_Add_error_string.html
461share/doc/mpich/html/www3/MPI_Address.html 463share/doc/mpich/html/www3/MPI_Address.html
462share/doc/mpich/html/www3/MPI_Aint_add.html 464share/doc/mpich/html/www3/MPI_Aint_add.html
463share/doc/mpich/html/www3/MPI_Aint_diff.html 465share/doc/mpich/html/www3/MPI_Aint_diff.html
cvs diff -r1.26 -r1.27 pkgsrc/parallel/mpi-ch/distinfo (expand / switch to unified diff)

--- pkgsrc/parallel/mpi-ch/distinfo 2017/04/29 18:18:52 1.26
+++ pkgsrc/parallel/mpi-ch/distinfo 2018/11/04 11:49:40 1.27
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.26 2017/04/29 18:18:52 adam Exp $ 1$NetBSD: distinfo,v 1.27 2018/11/04 11:49:40 bsiegert Exp $
2 2
3SHA1 (mpich-3.2.tar.gz) = 5fae7df02f750b6966837b554f9985a9c574236f 3SHA1 (mpich-3.2.1.tar.gz) = 24c53333927d1760db78be2b9ef217f4f3dcf771
4RMD160 (mpich-3.2.tar.gz) = d7180d5129fe313830504e1d59c3b37831554bee 4RMD160 (mpich-3.2.1.tar.gz) = b830ba3f5cb5401c03898ad9abf87c60d5cf1e50
5SHA512 (mpich-3.2.tar.gz) = 083c51655b4355827bd7fa4fe528046e2bc77b7747d869ff87b79fa324c3cc2a9b5640ccb7271490ccc0dd627e354a33a449bbab448501bbfddcfe5f999ee717 5SHA512 (mpich-3.2.1.tar.gz) = 659a11cf02302f27eb1db77667dd4c7a4f8008b1d73f5f0f0f28ee6b5d9cca2130bac3d010a132136ba15a25a738ec9cbda67255133aeb42f0d82a2ded23d23d
6Size (mpich-3.2.tar.gz) = 11862150 bytes 6Size (mpich-3.2.1.tar.gz) = 11908154 bytes
7SHA1 (patch-Makefile.in) = 5f98d902eae4102f283ddb1721e4d089d8a81779 7SHA1 (patch-Makefile.in) = 7fee6ae5e86943f7ea1b3eef103c5b5b4b66490b
8SHA1 (patch-configure) = 00c5706f825dbadeb544d14ee98a1a27e49d0797 8SHA1 (patch-configure) = 00c5706f825dbadeb544d14ee98a1a27e49d0797
9SHA1 (patch-src_mpi_romio_configure) = a517932dd1af1cc0da889b838fd732a5fb766910 9SHA1 (patch-src_mpi_romio_configure) = a517932dd1af1cc0da889b838fd732a5fb766910
10SHA1 (patch-src_mpid_ch3_channels_nemesis_include_mpidi_ch3_impl.h) = ec7d063fb22fbfb3fc1ee85197afd6f4c4db22bd 10SHA1 (patch-src_mpid_ch3_channels_nemesis_include_mpidi_ch3_impl.h) = ec7d063fb22fbfb3fc1ee85197afd6f4c4db22bd
11SHA1 (patch-src_mpid_ch3_channels_nemesis_src_ch3__init.c) = ddc3fe79eecabf81b7b092ccaa91c39fa19b29dc 11SHA1 (patch-src_mpid_ch3_channels_nemesis_src_ch3__init.c) = ddc3fe79eecabf81b7b092ccaa91c39fa19b29dc
12SHA1 (patch-src_pm_hydra_configure) = 814abcb0c6424ae9a1718c016e5b0a7f3ad85e59 12SHA1 (patch-src_pm_hydra_configure) = 814abcb0c6424ae9a1718c016e5b0a7f3ad85e59
cvs diff -r1.3 -r1.4 pkgsrc/parallel/mpi-ch/patches/patch-Makefile.in (expand / switch to unified diff)

--- pkgsrc/parallel/mpi-ch/patches/patch-Makefile.in 2017/04/29 18:18:52 1.3
+++ pkgsrc/parallel/mpi-ch/patches/patch-Makefile.in 2018/11/04 11:49:40 1.4
@@ -1,26 +1,16 @@ @@ -1,26 +1,16 @@
1$NetBSD: patch-Makefile.in,v 1.3 2017/04/29 18:18:52 adam Exp $ 1$NetBSD: patch-Makefile.in,v 1.4 2018/11/04 11:49:40 bsiegert Exp $
2 2
3Link mpiexec.gforker also against mpllib. 
4Do not create libopa symlink; it conflicts with parallel/openpa/PLIST. 3Do not create libopa symlink; it conflicts with parallel/openpa/PLIST.
5 4
6--- Makefile.in.orig 2015-11-12 04:08:10.000000000 +0000 5--- Makefile.in.orig 2015-11-12 04:08:10.000000000 +0000
7+++ Makefile.in 6+++ Makefile.in
8@@ -10241,7 +10242,7 @@ common_pm_includes = \ 
9 # we may not want to add AM_CPPFLAGS for this program 
10 @BUILD_PM_GFORKER_TRUE@@PRIMARY_PM_GFORKER_TRUE@src_pm_gforker_mpiexec_CPPFLAGS = $(common_pm_includes) $(AM_CPPFLAGS) 
11 @BUILD_PM_GFORKER_TRUE@@PRIMARY_PM_GFORKER_FALSE@src_pm_gforker_mpiexec_gforker_SOURCES = src/pm/gforker/mpiexec.c  
12-@BUILD_PM_GFORKER_TRUE@@PRIMARY_PM_GFORKER_FALSE@src_pm_gforker_mpiexec_gforker_LDADD = src/pm/util/libmpiexec.a 
13+@BUILD_PM_GFORKER_TRUE@@PRIMARY_PM_GFORKER_FALSE@src_pm_gforker_mpiexec_gforker_LDADD = src/pm/util/libmpiexec.a $(mpllib) 
14 # we may not want to add AM_CPPFLAGS for this program 
15 @BUILD_PM_GFORKER_TRUE@@PRIMARY_PM_GFORKER_FALSE@src_pm_gforker_mpiexec_gforker_CPPFLAGS = $(common_pm_includes) $(AM_CPPFLAGS) 
16 @BUILD_PM_REMSHELL_TRUE@@PRIMARY_PM_REMSHELL_TRUE@src_pm_remshell_mpiexec_SOURCES = src/pm/remshell/mpiexec.c  
17@@ -39783,9 +39784,6 @@ install-exec-hook: 7@@ -39783,9 +39784,6 @@ install-exec-hook:
18 if test "@MPILIBNAME@" != "mpl" ; then \ 8 if test "@MPILIBNAME@" != "mpl" ; then \
19 cd ${DESTDIR}${libdir} && ln -f -s lib@MPILIBNAME@@SHLIB_EXT@ libmpl@SHLIB_EXT@ ; \ 9 cd ${DESTDIR}${libdir} && ln -f -s lib@MPILIBNAME@@SHLIB_EXT@ libmpl@SHLIB_EXT@ ; \
20 fi ; \ 10 fi ; \
21- if test "@MPILIBNAME@" != "opa" ; then \ 11- if test "@MPILIBNAME@" != "opa" ; then \
22- cd ${DESTDIR}${libdir} && ln -f -s lib@MPILIBNAME@@SHLIB_EXT@ libopa@SHLIB_EXT@ ; \ 12- cd ${DESTDIR}${libdir} && ln -f -s lib@MPILIBNAME@@SHLIB_EXT@ libopa@SHLIB_EXT@ ; \
23- fi ; \ 13- fi ; \
24 if test "@MPILIBNAME@" != "mpich" ; then \ 14 if test "@MPILIBNAME@" != "mpich" ; then \
25 cd ${DESTDIR}${libdir} && ln -f -s lib@MPILIBNAME@@SHLIB_EXT@ libmpich@SHLIB_EXT@ ; \ 15 cd ${DESTDIR}${libdir} && ln -f -s lib@MPILIBNAME@@SHLIB_EXT@ libmpich@SHLIB_EXT@ ; \
26 fi ; \ 16 fi ; \