diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile index 8fb484aeb960..00af913a2812 100644 --- a/parallel/mpi-ch/Makefile +++ b/parallel/mpi-ch/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.82 2016/07/09 06:38:47 wiz Exp $ +# $NetBSD: Makefile,v 1.83 2017/04/29 18:18:52 adam Exp $ -DISTNAME= mpich-3.0.4 -PKGREVISION= 4 +DISTNAME= mpich-3.2 CATEGORIES= parallel MASTER_SITES= http://www.mpich.org/static/tarballs/${PKGVERSION_NOREV}/ @@ -23,25 +22,28 @@ USE_TOOLS+= perl:run GNU_CONFIGURE= yes GNU_CONFIGURE_PREFIX= ${MPI_PREFIX} CONFIGURE_ARGS+= --datadir=${MPI_PREFIX}/share/${PKGBASE} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --docdir=${MPI_PREFIX}/share/doc/${PKGBASE} CONFIGURE_ARGS+= --htmldir=${MPI_PREFIX}/share/doc/${PKGBASE}/html -CONFIGURE_ARGS+= --with-openpa-prefix=${BUILDLINK_PREFIX.openpa} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-hwloc-prefix=${BUILDLINK_PREFIX.hwloc} +CONFIGURE_ARGS+= --with-openpa-prefix=${BUILDLINK_PREFIX.openpa} CONFIGURE_ARGS+= --with-pm=hydra:gforker +CONFIGURE_ARGS+= --with-thread-package=posix # Make MPI compiler wrapper usable outside pkgsrc: CONFIGURE_ENV+= WRAPPER_LDFLAGS="-L${MPI_PREFIX}/lib ${COMPILER_RPATH_FLAG}${MPI_PREFIX}/lib" CONFIGURE_ENV+= MPICH_LDFLAGS="-L${MPI_PREFIX}/lib ${COMPILER_RPATH_FLAG}${MPI_PREFIX}/lib" +LDFLAGS+= -lm + PKG_SYSCONFSUBDIR= mpich BUILDLINK_PASSTHRU_RPATHDIRS+= ${MPI_PREFIX}/lib -CONF_FILES+= share/${PKGBASE}/examples/mpicc.conf \ +#CONF_FILES+= share/${PKGBASE}/examples/mpicc.conf \ ${PKG_SYSCONFDIR}/mpicc.conf -CONF_FILES+= share/${PKGBASE}/examples/mpicxx.conf \ +#CONF_FILES+= share/${PKGBASE}/examples/mpicxx.conf \ ${PKG_SYSCONFDIR}/mpicxx.conf -CONF_FILES+= share/${PKGBASE}/examples/mpif77.conf \ +#CONF_FILES+= share/${PKGBASE}/examples/mpif77.conf \ ${PKG_SYSCONFDIR}/mpif77.conf # FreeBSD 6 hack: @@ -56,4 +58,5 @@ TEST_TARGET= check .include "../../parallel/hwloc/buildlink3.mk" .include "../../parallel/openpa/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/parallel/mpi-ch/PLIST b/parallel/mpi-ch/PLIST index 2a94ddf60d97..2d7e852c07b2 100644 --- a/parallel/mpi-ch/PLIST +++ b/parallel/mpi-ch/PLIST @@ -1,37 +1,7 @@ -@comment $NetBSD: PLIST,v 1.21 2013/05/10 08:24:57 adam Exp $ +@comment $NetBSD: PLIST,v 1.22 2017/04/29 18:18:52 adam Exp $ bin/hydra_nameserver bin/hydra_persist bin/hydra_pmi_proxy -${PLIST.mpd}bin/mpd -${PLIST.mpd}bin/mpd.py -${PLIST.mpd}bin/mpdallexit -${PLIST.mpd}bin/mpdallexit.py -${PLIST.mpd}bin/mpdboot -${PLIST.mpd}bin/mpdboot.py -${PLIST.mpd}bin/mpdcheck -${PLIST.mpd}bin/mpdcheck.py -${PLIST.mpd}bin/mpdchkpyver.py -${PLIST.mpd}bin/mpdcleanup -${PLIST.mpd}bin/mpdcleanup.py -${PLIST.mpd}bin/mpdexit -${PLIST.mpd}bin/mpdexit.py -${PLIST.mpd}bin/mpdgdbdrv.py -${PLIST.mpd}bin/mpdhelp -${PLIST.mpd}bin/mpdhelp.py -${PLIST.mpd}bin/mpdkilljob -${PLIST.mpd}bin/mpdkilljob.py -${PLIST.mpd}bin/mpdlib.py -${PLIST.mpd}bin/mpdlistjobs -${PLIST.mpd}bin/mpdlistjobs.py -${PLIST.mpd}bin/mpdman.py -${PLIST.mpd}bin/mpdringtest -${PLIST.mpd}bin/mpdringtest.py -${PLIST.mpd}bin/mpdroot -${PLIST.mpd}bin/mpdrun -${PLIST.mpd}bin/mpdsigjob -${PLIST.mpd}bin/mpdsigjob.py -${PLIST.mpd}bin/mpdtrace -${PLIST.mpd}bin/mpdtrace.py bin/mpic++ bin/mpicc bin/mpichversion @@ -39,40 +9,52 @@ bin/mpicxx bin/mpiexec bin/mpiexec.gforker bin/mpiexec.hydra -${PLIST.mpd}bin/mpiexec.mpd -bin/mpif77 +${PLIST.f90}bin/mpif77 ${PLIST.f90}bin/mpif90 +${PLIST.f90}bin/mpifort bin/mpirun +bin/mpivars bin/parkill include/mpi.h ${PLIST.f90}include/mpi.mod ${PLIST.f90}include/mpi_base.mod ${PLIST.f90}include/mpi_constants.mod +${PLIST.f90}include/mpi_sizeofs.mod include/mpicxx.h -include/mpif.h +${PLIST.f90}include/mpif.h include/mpio.h include/mpiof.h -${PLIST.f90}include/mpi_sizeofs.mod -lib/libfmpich.la -lib/libmpich.la -lib/libmpichcxx.la -${PLIST.f90}lib/libmpichf90.la -lib/libmpl.la +lib/libfmpich.so +lib/libmpi.la +lib/libmpich.so +lib/libmpichcxx.so +lib/libmpichf90.so +lib/libmpicxx.la +${PLIST.f90}lib/libmpifort.la +lib/libmpl.so +lib/libopa.so lib/pkgconfig/mpich.pc +man/man1/hydra_nameserver.1 +man/man1/hydra_persist.1 +man/man1/hydra_pmi_proxy.1 man/man1/mpicc.1 man/man1/mpicxx.1 man/man1/mpiexec.1 man/man1/mpif77.1 -man/man1/mpif90.1 -man/man3/MPIX_Comm_group_failed.3 -man/man3/MPIX_Comm_reenable_anysource.3 -man/man3/MPIX_Comm_remote_group_failed.3 +man/man1/mpifort.1 +man/man3/MPIX_Comm_agree.3 +man/man3/MPIX_Comm_failure_ack.3 +man/man3/MPIX_Comm_failure_get_acked.3 +man/man3/MPIX_Comm_revoke.3 +man/man3/MPIX_Comm_shrink.3 man/man3/MPI_Abort.3 man/man3/MPI_Accumulate.3 man/man3/MPI_Add_error_class.3 man/man3/MPI_Add_error_code.3 man/man3/MPI_Add_error_string.3 man/man3/MPI_Address.3 +man/man3/MPI_Aint_add.3 +man/man3/MPI_Aint_diff.3 man/man3/MPI_Allgather.3 man/man3/MPI_Allgatherv.3 man/man3/MPI_Alloc_mem.3 @@ -166,10 +148,14 @@ man/man3/MPI_File_get_size.3 man/man3/MPI_File_get_type_extent.3 man/man3/MPI_File_get_view.3 man/man3/MPI_File_iread.3 +man/man3/MPI_File_iread_all.3 man/man3/MPI_File_iread_at.3 +man/man3/MPI_File_iread_at_all.3 man/man3/MPI_File_iread_shared.3 man/man3/MPI_File_iwrite.3 +man/man3/MPI_File_iwrite_all.3 man/man3/MPI_File_iwrite_at.3 +man/man3/MPI_File_iwrite_at_all.3 man/man3/MPI_File_iwrite_shared.3 man/man3/MPI_File_open.3 man/man3/MPI_File_preallocate.3 @@ -339,9 +325,11 @@ man/man3/MPI_Status_set_elements_x.3 man/man3/MPI_T_category_changed.3 man/man3/MPI_T_category_get_categories.3 man/man3/MPI_T_category_get_cvars.3 +man/man3/MPI_T_category_get_index.3 man/man3/MPI_T_category_get_info.3 man/man3/MPI_T_category_get_num.3 man/man3/MPI_T_category_get_pvars.3 +man/man3/MPI_T_cvar_get_index.3 man/man3/MPI_T_cvar_get_info.3 man/man3/MPI_T_cvar_get_num.3 man/man3/MPI_T_cvar_handle_alloc.3 @@ -352,6 +340,7 @@ man/man3/MPI_T_enum_get_info.3 man/man3/MPI_T_enum_get_item.3 man/man3/MPI_T_finalize.3 man/man3/MPI_T_init_thread.3 +man/man3/MPI_T_pvar_get_index.3 man/man3/MPI_T_pvar_get_info.3 man/man3/MPI_T_pvar_get_num.3 man/man3/MPI_T_pvar_handle_alloc.3 @@ -452,11 +441,414 @@ man/man3/MPI_Win_unlock_all.3 man/man3/MPI_Win_wait.3 man/man3/MPI_Wtick.3 man/man3/MPI_Wtime.3 +share/doc/mpich/html/index.html +share/doc/mpich/html/www1/index.htm +share/doc/mpich/html/www1/mpicc.html +share/doc/mpich/html/www1/mpicxx.html +share/doc/mpich/html/www1/mpiexec.html +share/doc/mpich/html/www1/mpif77.html +share/doc/mpich/html/www1/mpifort.html +share/doc/mpich/html/www3/MPIX_Comm_agree.html +share/doc/mpich/html/www3/MPIX_Comm_failure_ack.html +share/doc/mpich/html/www3/MPIX_Comm_failure_get_acked.html +share/doc/mpich/html/www3/MPIX_Comm_revoke.html +share/doc/mpich/html/www3/MPIX_Comm_shrink.html +share/doc/mpich/html/www3/MPI_Abort.html +share/doc/mpich/html/www3/MPI_Accumulate.html +share/doc/mpich/html/www3/MPI_Add_error_class.html +share/doc/mpich/html/www3/MPI_Add_error_code.html +share/doc/mpich/html/www3/MPI_Add_error_string.html +share/doc/mpich/html/www3/MPI_Address.html +share/doc/mpich/html/www3/MPI_Aint_add.html +share/doc/mpich/html/www3/MPI_Aint_diff.html +share/doc/mpich/html/www3/MPI_Allgather.html +share/doc/mpich/html/www3/MPI_Allgatherv.html +share/doc/mpich/html/www3/MPI_Alloc_mem.html +share/doc/mpich/html/www3/MPI_Allreduce.html +share/doc/mpich/html/www3/MPI_Alltoall.html +share/doc/mpich/html/www3/MPI_Alltoallv.html +share/doc/mpich/html/www3/MPI_Alltoallw.html +share/doc/mpich/html/www3/MPI_Attr_delete.html +share/doc/mpich/html/www3/MPI_Attr_get.html +share/doc/mpich/html/www3/MPI_Attr_put.html +share/doc/mpich/html/www3/MPI_Barrier.html +share/doc/mpich/html/www3/MPI_Bcast.html +share/doc/mpich/html/www3/MPI_Bsend.html +share/doc/mpich/html/www3/MPI_Bsend_init.html +share/doc/mpich/html/www3/MPI_Buffer_attach.html +share/doc/mpich/html/www3/MPI_Buffer_detach.html +share/doc/mpich/html/www3/MPI_Cancel.html +share/doc/mpich/html/www3/MPI_Cart_coords.html +share/doc/mpich/html/www3/MPI_Cart_create.html +share/doc/mpich/html/www3/MPI_Cart_get.html +share/doc/mpich/html/www3/MPI_Cart_map.html +share/doc/mpich/html/www3/MPI_Cart_rank.html +share/doc/mpich/html/www3/MPI_Cart_shift.html +share/doc/mpich/html/www3/MPI_Cart_sub.html +share/doc/mpich/html/www3/MPI_Cartdim_get.html +share/doc/mpich/html/www3/MPI_Close_port.html +share/doc/mpich/html/www3/MPI_Comm_accept.html +share/doc/mpich/html/www3/MPI_Comm_call_errhandler.html +share/doc/mpich/html/www3/MPI_Comm_compare.html +share/doc/mpich/html/www3/MPI_Comm_connect.html +share/doc/mpich/html/www3/MPI_Comm_create.html +share/doc/mpich/html/www3/MPI_Comm_create_errhandler.html +share/doc/mpich/html/www3/MPI_Comm_create_group.html +share/doc/mpich/html/www3/MPI_Comm_create_keyval.html +share/doc/mpich/html/www3/MPI_Comm_delete_attr.html +share/doc/mpich/html/www3/MPI_Comm_disconnect.html +share/doc/mpich/html/www3/MPI_Comm_dup.html +share/doc/mpich/html/www3/MPI_Comm_dup_with_info.html +share/doc/mpich/html/www3/MPI_Comm_free.html +share/doc/mpich/html/www3/MPI_Comm_free_keyval.html +share/doc/mpich/html/www3/MPI_Comm_get_attr.html +share/doc/mpich/html/www3/MPI_Comm_get_errhandler.html +share/doc/mpich/html/www3/MPI_Comm_get_info.html +share/doc/mpich/html/www3/MPI_Comm_get_name.html +share/doc/mpich/html/www3/MPI_Comm_get_parent.html +share/doc/mpich/html/www3/MPI_Comm_group.html +share/doc/mpich/html/www3/MPI_Comm_idup.html +share/doc/mpich/html/www3/MPI_Comm_join.html +share/doc/mpich/html/www3/MPI_Comm_rank.html +share/doc/mpich/html/www3/MPI_Comm_remote_group.html +share/doc/mpich/html/www3/MPI_Comm_remote_size.html +share/doc/mpich/html/www3/MPI_Comm_set_attr.html +share/doc/mpich/html/www3/MPI_Comm_set_errhandler.html +share/doc/mpich/html/www3/MPI_Comm_set_info.html +share/doc/mpich/html/www3/MPI_Comm_set_name.html +share/doc/mpich/html/www3/MPI_Comm_size.html +share/doc/mpich/html/www3/MPI_Comm_spawn.html +share/doc/mpich/html/www3/MPI_Comm_spawn_multiple.html +share/doc/mpich/html/www3/MPI_Comm_split.html +share/doc/mpich/html/www3/MPI_Comm_split_type.html +share/doc/mpich/html/www3/MPI_Comm_test_inter.html +share/doc/mpich/html/www3/MPI_Compare_and_swap.html +share/doc/mpich/html/www3/MPI_Dims_create.html +share/doc/mpich/html/www3/MPI_Dist_graph_create.html +share/doc/mpich/html/www3/MPI_Dist_graph_create_adjacent.html +share/doc/mpich/html/www3/MPI_Dist_graph_neighbors.html +share/doc/mpich/html/www3/MPI_Dist_graph_neighbors_count.html +share/doc/mpich/html/www3/MPI_Errhandler_create.html +share/doc/mpich/html/www3/MPI_Errhandler_free.html +share/doc/mpich/html/www3/MPI_Errhandler_get.html +share/doc/mpich/html/www3/MPI_Errhandler_set.html +share/doc/mpich/html/www3/MPI_Error_class.html +share/doc/mpich/html/www3/MPI_Error_string.html +share/doc/mpich/html/www3/MPI_Exscan.html +share/doc/mpich/html/www3/MPI_Fetch_and_op.html +share/doc/mpich/html/www3/MPI_File_c2f.html +share/doc/mpich/html/www3/MPI_File_call_errhandler.html +share/doc/mpich/html/www3/MPI_File_close.html +share/doc/mpich/html/www3/MPI_File_create_errhandler.html +share/doc/mpich/html/www3/MPI_File_delete.html +share/doc/mpich/html/www3/MPI_File_f2c.html +share/doc/mpich/html/www3/MPI_File_get_amode.html +share/doc/mpich/html/www3/MPI_File_get_atomicity.html +share/doc/mpich/html/www3/MPI_File_get_byte_offset.html +share/doc/mpich/html/www3/MPI_File_get_errhandler.html +share/doc/mpich/html/www3/MPI_File_get_group.html +share/doc/mpich/html/www3/MPI_File_get_info.html +share/doc/mpich/html/www3/MPI_File_get_position.html +share/doc/mpich/html/www3/MPI_File_get_position_shared.html +share/doc/mpich/html/www3/MPI_File_get_size.html +share/doc/mpich/html/www3/MPI_File_get_type_extent.html +share/doc/mpich/html/www3/MPI_File_get_view.html +share/doc/mpich/html/www3/MPI_File_iread.html +share/doc/mpich/html/www3/MPI_File_iread_all.html +share/doc/mpich/html/www3/MPI_File_iread_at.html +share/doc/mpich/html/www3/MPI_File_iread_at_all.html +share/doc/mpich/html/www3/MPI_File_iread_shared.html +share/doc/mpich/html/www3/MPI_File_iwrite.html +share/doc/mpich/html/www3/MPI_File_iwrite_all.html +share/doc/mpich/html/www3/MPI_File_iwrite_at.html +share/doc/mpich/html/www3/MPI_File_iwrite_at_all.html +share/doc/mpich/html/www3/MPI_File_iwrite_shared.html +share/doc/mpich/html/www3/MPI_File_open.html +share/doc/mpich/html/www3/MPI_File_preallocate.html +share/doc/mpich/html/www3/MPI_File_read.html +share/doc/mpich/html/www3/MPI_File_read_all.html +share/doc/mpich/html/www3/MPI_File_read_all_begin.html +share/doc/mpich/html/www3/MPI_File_read_all_end.html +share/doc/mpich/html/www3/MPI_File_read_at.html +share/doc/mpich/html/www3/MPI_File_read_at_all.html +share/doc/mpich/html/www3/MPI_File_read_at_all_begin.html +share/doc/mpich/html/www3/MPI_File_read_at_all_end.html +share/doc/mpich/html/www3/MPI_File_read_ordered.html +share/doc/mpich/html/www3/MPI_File_read_ordered_begin.html +share/doc/mpich/html/www3/MPI_File_read_ordered_end.html +share/doc/mpich/html/www3/MPI_File_read_shared.html +share/doc/mpich/html/www3/MPI_File_seek.html +share/doc/mpich/html/www3/MPI_File_seek_shared.html +share/doc/mpich/html/www3/MPI_File_set_atomicity.html +share/doc/mpich/html/www3/MPI_File_set_errhandler.html +share/doc/mpich/html/www3/MPI_File_set_info.html +share/doc/mpich/html/www3/MPI_File_set_size.html +share/doc/mpich/html/www3/MPI_File_set_view.html +share/doc/mpich/html/www3/MPI_File_sync.html +share/doc/mpich/html/www3/MPI_File_write.html +share/doc/mpich/html/www3/MPI_File_write_all.html +share/doc/mpich/html/www3/MPI_File_write_all_begin.html +share/doc/mpich/html/www3/MPI_File_write_all_end.html +share/doc/mpich/html/www3/MPI_File_write_at.html +share/doc/mpich/html/www3/MPI_File_write_at_all.html +share/doc/mpich/html/www3/MPI_File_write_at_all_begin.html +share/doc/mpich/html/www3/MPI_File_write_at_all_end.html +share/doc/mpich/html/www3/MPI_File_write_ordered.html +share/doc/mpich/html/www3/MPI_File_write_ordered_begin.html +share/doc/mpich/html/www3/MPI_File_write_ordered_end.html +share/doc/mpich/html/www3/MPI_File_write_shared.html +share/doc/mpich/html/www3/MPI_Finalize.html +share/doc/mpich/html/www3/MPI_Finalized.html +share/doc/mpich/html/www3/MPI_Free_mem.html +share/doc/mpich/html/www3/MPI_Gather.html +share/doc/mpich/html/www3/MPI_Gatherv.html +share/doc/mpich/html/www3/MPI_Get.html +share/doc/mpich/html/www3/MPI_Get_accumulate.html +share/doc/mpich/html/www3/MPI_Get_address.html +share/doc/mpich/html/www3/MPI_Get_count.html +share/doc/mpich/html/www3/MPI_Get_elements.html +share/doc/mpich/html/www3/MPI_Get_elements_x.html +share/doc/mpich/html/www3/MPI_Get_library_version.html +share/doc/mpich/html/www3/MPI_Get_processor_name.html +share/doc/mpich/html/www3/MPI_Get_version.html +share/doc/mpich/html/www3/MPI_Graph_create.html +share/doc/mpich/html/www3/MPI_Graph_get.html +share/doc/mpich/html/www3/MPI_Graph_map.html +share/doc/mpich/html/www3/MPI_Graph_neighbors.html +share/doc/mpich/html/www3/MPI_Graph_neighbors_count.html +share/doc/mpich/html/www3/MPI_Graphdims_get.html +share/doc/mpich/html/www3/MPI_Grequest_complete.html +share/doc/mpich/html/www3/MPI_Grequest_start.html +share/doc/mpich/html/www3/MPI_Group_compare.html +share/doc/mpich/html/www3/MPI_Group_difference.html +share/doc/mpich/html/www3/MPI_Group_excl.html +share/doc/mpich/html/www3/MPI_Group_free.html +share/doc/mpich/html/www3/MPI_Group_incl.html +share/doc/mpich/html/www3/MPI_Group_intersection.html +share/doc/mpich/html/www3/MPI_Group_range_excl.html +share/doc/mpich/html/www3/MPI_Group_range_incl.html +share/doc/mpich/html/www3/MPI_Group_rank.html +share/doc/mpich/html/www3/MPI_Group_size.html +share/doc/mpich/html/www3/MPI_Group_translate_ranks.html +share/doc/mpich/html/www3/MPI_Group_union.html +share/doc/mpich/html/www3/MPI_Iallgather.html +share/doc/mpich/html/www3/MPI_Iallgatherv.html +share/doc/mpich/html/www3/MPI_Iallreduce.html +share/doc/mpich/html/www3/MPI_Ialltoall.html +share/doc/mpich/html/www3/MPI_Ialltoallv.html +share/doc/mpich/html/www3/MPI_Ialltoallw.html +share/doc/mpich/html/www3/MPI_Ibarrier.html +share/doc/mpich/html/www3/MPI_Ibcast.html +share/doc/mpich/html/www3/MPI_Ibsend.html +share/doc/mpich/html/www3/MPI_Iexscan.html +share/doc/mpich/html/www3/MPI_Igather.html +share/doc/mpich/html/www3/MPI_Igatherv.html +share/doc/mpich/html/www3/MPI_Improbe.html +share/doc/mpich/html/www3/MPI_Imrecv.html +share/doc/mpich/html/www3/MPI_Ineighbor_allgather.html +share/doc/mpich/html/www3/MPI_Ineighbor_allgatherv.html +share/doc/mpich/html/www3/MPI_Ineighbor_alltoall.html +share/doc/mpich/html/www3/MPI_Ineighbor_alltoallv.html +share/doc/mpich/html/www3/MPI_Ineighbor_alltoallw.html +share/doc/mpich/html/www3/MPI_Info_create.html +share/doc/mpich/html/www3/MPI_Info_delete.html +share/doc/mpich/html/www3/MPI_Info_dup.html +share/doc/mpich/html/www3/MPI_Info_free.html +share/doc/mpich/html/www3/MPI_Info_get.html +share/doc/mpich/html/www3/MPI_Info_get_nkeys.html +share/doc/mpich/html/www3/MPI_Info_get_nthkey.html +share/doc/mpich/html/www3/MPI_Info_get_valuelen.html +share/doc/mpich/html/www3/MPI_Info_set.html +share/doc/mpich/html/www3/MPI_Init.html +share/doc/mpich/html/www3/MPI_Init_thread.html +share/doc/mpich/html/www3/MPI_Initialized.html +share/doc/mpich/html/www3/MPI_Intercomm_create.html +share/doc/mpich/html/www3/MPI_Intercomm_merge.html +share/doc/mpich/html/www3/MPI_Iprobe.html +share/doc/mpich/html/www3/MPI_Irecv.html +share/doc/mpich/html/www3/MPI_Ireduce.html +share/doc/mpich/html/www3/MPI_Ireduce_scatter.html +share/doc/mpich/html/www3/MPI_Ireduce_scatter_block.html +share/doc/mpich/html/www3/MPI_Irsend.html +share/doc/mpich/html/www3/MPI_Is_thread_main.html +share/doc/mpich/html/www3/MPI_Iscan.html +share/doc/mpich/html/www3/MPI_Iscatter.html +share/doc/mpich/html/www3/MPI_Iscatterv.html +share/doc/mpich/html/www3/MPI_Isend.html +share/doc/mpich/html/www3/MPI_Issend.html +share/doc/mpich/html/www3/MPI_Keyval_create.html +share/doc/mpich/html/www3/MPI_Keyval_free.html +share/doc/mpich/html/www3/MPI_Lookup_name.html +share/doc/mpich/html/www3/MPI_Mprobe.html +share/doc/mpich/html/www3/MPI_Mrecv.html +share/doc/mpich/html/www3/MPI_Neighbor_allgather.html +share/doc/mpich/html/www3/MPI_Neighbor_allgatherv.html +share/doc/mpich/html/www3/MPI_Neighbor_alltoall.html +share/doc/mpich/html/www3/MPI_Neighbor_alltoallv.html +share/doc/mpich/html/www3/MPI_Neighbor_alltoallw.html +share/doc/mpich/html/www3/MPI_Op_commute.html +share/doc/mpich/html/www3/MPI_Op_create.html +share/doc/mpich/html/www3/MPI_Op_free.html +share/doc/mpich/html/www3/MPI_Open_port.html +share/doc/mpich/html/www3/MPI_Pack.html +share/doc/mpich/html/www3/MPI_Pack_external.html +share/doc/mpich/html/www3/MPI_Pack_external_size.html +share/doc/mpich/html/www3/MPI_Pack_size.html +share/doc/mpich/html/www3/MPI_Pcontrol.html +share/doc/mpich/html/www3/MPI_Probe.html +share/doc/mpich/html/www3/MPI_Publish_name.html +share/doc/mpich/html/www3/MPI_Put.html +share/doc/mpich/html/www3/MPI_Query_thread.html +share/doc/mpich/html/www3/MPI_Raccumulate.html +share/doc/mpich/html/www3/MPI_Recv.html +share/doc/mpich/html/www3/MPI_Recv_init.html +share/doc/mpich/html/www3/MPI_Reduce.html +share/doc/mpich/html/www3/MPI_Reduce_local.html +share/doc/mpich/html/www3/MPI_Reduce_scatter.html +share/doc/mpich/html/www3/MPI_Reduce_scatter_block.html +share/doc/mpich/html/www3/MPI_Register_datarep.html +share/doc/mpich/html/www3/MPI_Request_free.html +share/doc/mpich/html/www3/MPI_Request_get_status.html +share/doc/mpich/html/www3/MPI_Rget.html +share/doc/mpich/html/www3/MPI_Rget_accumulate.html +share/doc/mpich/html/www3/MPI_Rput.html +share/doc/mpich/html/www3/MPI_Rsend.html +share/doc/mpich/html/www3/MPI_Rsend_init.html +share/doc/mpich/html/www3/MPI_Scan.html +share/doc/mpich/html/www3/MPI_Scatter.html +share/doc/mpich/html/www3/MPI_Scatterv.html +share/doc/mpich/html/www3/MPI_Send.html +share/doc/mpich/html/www3/MPI_Send_init.html +share/doc/mpich/html/www3/MPI_Sendrecv.html +share/doc/mpich/html/www3/MPI_Sendrecv_replace.html +share/doc/mpich/html/www3/MPI_Ssend.html +share/doc/mpich/html/www3/MPI_Ssend_init.html +share/doc/mpich/html/www3/MPI_Start.html +share/doc/mpich/html/www3/MPI_Startall.html +share/doc/mpich/html/www3/MPI_Status_set_cancelled.html +share/doc/mpich/html/www3/MPI_Status_set_elements.html +share/doc/mpich/html/www3/MPI_Status_set_elements_x.html +share/doc/mpich/html/www3/MPI_T_category_changed.html +share/doc/mpich/html/www3/MPI_T_category_get_categories.html +share/doc/mpich/html/www3/MPI_T_category_get_cvars.html +share/doc/mpich/html/www3/MPI_T_category_get_index.html +share/doc/mpich/html/www3/MPI_T_category_get_info.html +share/doc/mpich/html/www3/MPI_T_category_get_num.html +share/doc/mpich/html/www3/MPI_T_category_get_pvars.html +share/doc/mpich/html/www3/MPI_T_cvar_get_index.html +share/doc/mpich/html/www3/MPI_T_cvar_get_info.html +share/doc/mpich/html/www3/MPI_T_cvar_get_num.html +share/doc/mpich/html/www3/MPI_T_cvar_handle_alloc.html +share/doc/mpich/html/www3/MPI_T_cvar_handle_free.html +share/doc/mpich/html/www3/MPI_T_cvar_read.html +share/doc/mpich/html/www3/MPI_T_cvar_write.html +share/doc/mpich/html/www3/MPI_T_enum_get_info.html +share/doc/mpich/html/www3/MPI_T_enum_get_item.html +share/doc/mpich/html/www3/MPI_T_finalize.html +share/doc/mpich/html/www3/MPI_T_init_thread.html +share/doc/mpich/html/www3/MPI_T_pvar_get_index.html +share/doc/mpich/html/www3/MPI_T_pvar_get_info.html +share/doc/mpich/html/www3/MPI_T_pvar_get_num.html +share/doc/mpich/html/www3/MPI_T_pvar_handle_alloc.html +share/doc/mpich/html/www3/MPI_T_pvar_handle_free.html +share/doc/mpich/html/www3/MPI_T_pvar_read.html +share/doc/mpich/html/www3/MPI_T_pvar_readreset.html +share/doc/mpich/html/www3/MPI_T_pvar_reset.html +share/doc/mpich/html/www3/MPI_T_pvar_session_create.html +share/doc/mpich/html/www3/MPI_T_pvar_session_free.html +share/doc/mpich/html/www3/MPI_T_pvar_start.html +share/doc/mpich/html/www3/MPI_T_pvar_stop.html +share/doc/mpich/html/www3/MPI_T_pvar_write.html +share/doc/mpich/html/www3/MPI_Test.html +share/doc/mpich/html/www3/MPI_Test_cancelled.html +share/doc/mpich/html/www3/MPI_Testall.html +share/doc/mpich/html/www3/MPI_Testany.html +share/doc/mpich/html/www3/MPI_Testsome.html +share/doc/mpich/html/www3/MPI_Topo_test.html +share/doc/mpich/html/www3/MPI_Type_commit.html +share/doc/mpich/html/www3/MPI_Type_contiguous.html +share/doc/mpich/html/www3/MPI_Type_create_darray.html +share/doc/mpich/html/www3/MPI_Type_create_hindexed.html +share/doc/mpich/html/www3/MPI_Type_create_hindexed_block.html +share/doc/mpich/html/www3/MPI_Type_create_hvector.html +share/doc/mpich/html/www3/MPI_Type_create_indexed_block.html +share/doc/mpich/html/www3/MPI_Type_create_keyval.html +share/doc/mpich/html/www3/MPI_Type_create_resized.html +share/doc/mpich/html/www3/MPI_Type_create_struct.html +share/doc/mpich/html/www3/MPI_Type_create_subarray.html +share/doc/mpich/html/www3/MPI_Type_delete_attr.html +share/doc/mpich/html/www3/MPI_Type_dup.html +share/doc/mpich/html/www3/MPI_Type_extent.html +share/doc/mpich/html/www3/MPI_Type_free.html +share/doc/mpich/html/www3/MPI_Type_free_keyval.html +share/doc/mpich/html/www3/MPI_Type_get_attr.html +share/doc/mpich/html/www3/MPI_Type_get_contents.html +share/doc/mpich/html/www3/MPI_Type_get_envelope.html +share/doc/mpich/html/www3/MPI_Type_get_extent.html +share/doc/mpich/html/www3/MPI_Type_get_extent_x.html +share/doc/mpich/html/www3/MPI_Type_get_name.html +share/doc/mpich/html/www3/MPI_Type_get_true_extent.html +share/doc/mpich/html/www3/MPI_Type_get_true_extent_x.html +share/doc/mpich/html/www3/MPI_Type_hindexed.html +share/doc/mpich/html/www3/MPI_Type_hvector.html +share/doc/mpich/html/www3/MPI_Type_indexed.html +share/doc/mpich/html/www3/MPI_Type_lb.html +share/doc/mpich/html/www3/MPI_Type_match_size.html +share/doc/mpich/html/www3/MPI_Type_set_attr.html +share/doc/mpich/html/www3/MPI_Type_set_name.html +share/doc/mpich/html/www3/MPI_Type_size.html +share/doc/mpich/html/www3/MPI_Type_size_x.html +share/doc/mpich/html/www3/MPI_Type_struct.html +share/doc/mpich/html/www3/MPI_Type_ub.html +share/doc/mpich/html/www3/MPI_Type_vector.html +share/doc/mpich/html/www3/MPI_Unpack.html +share/doc/mpich/html/www3/MPI_Unpack_external.html +share/doc/mpich/html/www3/MPI_Unpublish_name.html +share/doc/mpich/html/www3/MPI_Wait.html +share/doc/mpich/html/www3/MPI_Waitall.html +share/doc/mpich/html/www3/MPI_Waitany.html +share/doc/mpich/html/www3/MPI_Waitsome.html +share/doc/mpich/html/www3/MPI_Win_allocate.html +share/doc/mpich/html/www3/MPI_Win_allocate_shared.html +share/doc/mpich/html/www3/MPI_Win_attach.html +share/doc/mpich/html/www3/MPI_Win_call_errhandler.html +share/doc/mpich/html/www3/MPI_Win_complete.html +share/doc/mpich/html/www3/MPI_Win_create.html +share/doc/mpich/html/www3/MPI_Win_create_dynamic.html +share/doc/mpich/html/www3/MPI_Win_create_errhandler.html +share/doc/mpich/html/www3/MPI_Win_create_keyval.html +share/doc/mpich/html/www3/MPI_Win_delete_attr.html +share/doc/mpich/html/www3/MPI_Win_detach.html +share/doc/mpich/html/www3/MPI_Win_fence.html +share/doc/mpich/html/www3/MPI_Win_flush.html +share/doc/mpich/html/www3/MPI_Win_flush_all.html +share/doc/mpich/html/www3/MPI_Win_flush_local.html +share/doc/mpich/html/www3/MPI_Win_flush_local_all.html +share/doc/mpich/html/www3/MPI_Win_free.html +share/doc/mpich/html/www3/MPI_Win_free_keyval.html +share/doc/mpich/html/www3/MPI_Win_get_attr.html +share/doc/mpich/html/www3/MPI_Win_get_errhandler.html +share/doc/mpich/html/www3/MPI_Win_get_group.html +share/doc/mpich/html/www3/MPI_Win_get_info.html +share/doc/mpich/html/www3/MPI_Win_get_name.html +share/doc/mpich/html/www3/MPI_Win_lock.html +share/doc/mpich/html/www3/MPI_Win_lock_all.html +share/doc/mpich/html/www3/MPI_Win_post.html +share/doc/mpich/html/www3/MPI_Win_set_attr.html +share/doc/mpich/html/www3/MPI_Win_set_errhandler.html +share/doc/mpich/html/www3/MPI_Win_set_info.html +share/doc/mpich/html/www3/MPI_Win_set_name.html +share/doc/mpich/html/www3/MPI_Win_shared_query.html +share/doc/mpich/html/www3/MPI_Win_start.html +share/doc/mpich/html/www3/MPI_Win_sync.html +share/doc/mpich/html/www3/MPI_Win_test.html +share/doc/mpich/html/www3/MPI_Win_unlock.html +share/doc/mpich/html/www3/MPI_Win_unlock_all.html +share/doc/mpich/html/www3/MPI_Win_wait.html +share/doc/mpich/html/www3/MPI_Wtick.html +share/doc/mpich/html/www3/MPI_Wtime.html +share/doc/mpich/html/www3/index.htm +share/doc/mpich/html/www3/mpi.cit share/doc/mpich/install.pdf share/doc/mpich/logging.pdf -share/doc/mpich/smpd_pmi.pdf share/doc/mpich/user.pdf -share/mpich/examples/mpicc.conf -share/mpich/examples/mpicxx.conf -share/mpich/examples/mpif77.conf -${PLIST.f90}share/mpich/examples/mpif90.conf diff --git a/parallel/mpi-ch/PLIST.Darwin b/parallel/mpi-ch/PLIST.Darwin index 8bc625a744a9..d46c4a459b04 100644 --- a/parallel/mpi-ch/PLIST.Darwin +++ b/parallel/mpi-ch/PLIST.Darwin @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST.Darwin,v 1.1 2013/05/10 08:25:33 adam Exp $ -lib/libpmpich.la +@comment $NetBSD: PLIST.Darwin,v 1.2 2017/04/29 18:18:52 adam Exp $ +lib/libpmpi.la diff --git a/parallel/mpi-ch/buildlink3.mk b/parallel/mpi-ch/buildlink3.mk index df9c0788c488..b5b8d1759f2a 100644 --- a/parallel/mpi-ch/buildlink3.mk +++ b/parallel/mpi-ch/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2015/11/25 12:52:26 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2017/04/29 18:18:52 adam Exp $ BUILDLINK_TREE+= mpich @@ -8,7 +8,7 @@ MPICH_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.mpich+= mpich>=3 BUILDLINK_PKGSRCDIR.mpich?= ../../parallel/mpi-ch -MPI_PREFIX?= $(BUILDLINK_PREFIX.mpich) +MPI_PREFIX?= ${BUILDLINK_PREFIX.mpich} .include "../../parallel/openpa/buildlink3.mk" .endif # MPICH_BUILDLINK3_MK diff --git a/parallel/mpi-ch/distinfo b/parallel/mpi-ch/distinfo index fee873b3ba31..a80bc0c7160a 100644 --- a/parallel/mpi-ch/distinfo +++ b/parallel/mpi-ch/distinfo @@ -1,10 +1,12 @@ -$NetBSD: distinfo,v 1.25 2015/11/02 23:46:12 agc Exp $ +$NetBSD: distinfo,v 1.26 2017/04/29 18:18:52 adam Exp $ -SHA1 (mpich-3.0.4.tar.gz) = e89cc8de89d18d5718f7b881f3835b5a0943f897 -RMD160 (mpich-3.0.4.tar.gz) = c14b3b335be863dd36c0a58630c969719d8ef217 -SHA512 (mpich-3.0.4.tar.gz) = f9d8b2cf561fe5f85c12512ef4dd7b0cf5ec8b53ddb07bfa0d1db2e3c8ae0382c77e0661f46b82ec96b05d18ea2d25328bb84e9528ac06e5925f30ec8ef030d0 -Size (mpich-3.0.4.tar.gz) = 10921075 bytes -SHA1 (patch-Makefile.in) = 32a78a384ecb94a30631a8a756e746edbe6e0060 -SHA1 (patch-configure) = 0e7fec4d30e33387d8b434c6b4e90bab1daa42ba -SHA1 (patch-src_mpid_ch3_channels_nemesis_include_mpidi_ch3_impl.h) = e0f3de9c7c229fee3de5e85e589b88987ef11a11 -SHA1 (patch-src_pm_hydra_configure) = c8d25676499386e4a2616db5ab2d86443f29b1f7 +SHA1 (mpich-3.2.tar.gz) = 5fae7df02f750b6966837b554f9985a9c574236f +RMD160 (mpich-3.2.tar.gz) = d7180d5129fe313830504e1d59c3b37831554bee +SHA512 (mpich-3.2.tar.gz) = 083c51655b4355827bd7fa4fe528046e2bc77b7747d869ff87b79fa324c3cc2a9b5640ccb7271490ccc0dd627e354a33a449bbab448501bbfddcfe5f999ee717 +Size (mpich-3.2.tar.gz) = 11862150 bytes +SHA1 (patch-Makefile.in) = 5f98d902eae4102f283ddb1721e4d089d8a81779 +SHA1 (patch-configure) = 00c5706f825dbadeb544d14ee98a1a27e49d0797 +SHA1 (patch-src_mpi_romio_configure) = a517932dd1af1cc0da889b838fd732a5fb766910 +SHA1 (patch-src_mpid_ch3_channels_nemesis_include_mpidi_ch3_impl.h) = ec7d063fb22fbfb3fc1ee85197afd6f4c4db22bd +SHA1 (patch-src_mpid_ch3_channels_nemesis_src_ch3__init.c) = ddc3fe79eecabf81b7b092ccaa91c39fa19b29dc +SHA1 (patch-src_pm_hydra_configure) = 814abcb0c6424ae9a1718c016e5b0a7f3ad85e59 diff --git a/parallel/mpi-ch/options.mk b/parallel/mpi-ch/options.mk index fa2d627b2a7a..86327bd363e0 100644 --- a/parallel/mpi-ch/options.mk +++ b/parallel/mpi-ch/options.mk @@ -1,12 +1,11 @@ -# $NetBSD: options.mk,v 1.3 2013/05/10 08:24:57 adam Exp $ +# $NetBSD: options.mk,v 1.4 2017/04/29 18:18:52 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mpich -PKG_SUPPORTED_OPTIONS= debug f90 mpich-mpd threads -PKG_SUGGESTED_OPTIONS= threads +PKG_SUPPORTED_OPTIONS= debug f90 .include "../../mk/bsd.options.mk" -PLIST_VARS+= f90 mpd +PLIST_VARS+= f90 .if !empty(PKG_OPTIONS:Mdebug) CONFIGURE_ARGS+= --enable-g=debug # problems @@ -15,23 +14,10 @@ INSTALL_UNSTRIPPED= yes .if !empty(PKG_OPTIONS:Mf90) USE_LANGUAGES+= fortran +CONFIGURE_ARGS+= --enable-fortran=yes PLIST.f90= yes .else -USE_LANGUAGES+= fortran77 -CONFIGURE_ARGS+= --disable-fc -.endif - -.if !empty(PKG_OPTIONS:Mthreads) -CONFIGURE_ARGS+= --with-thread-package=posix # aka pthreads -.include "../../mk/pthread.buildlink3.mk" -.endif - -# Allow coexistance of MPICH2 and musicpd by disabling MPICH2 parts: -.if !empty(PKG_OPTIONS:Mmpich-mpd) -CONFLICTS+= musicpd-[0-9]* # installs bin/mpd -CONFIGURE_ARGS+= --with-pm=hydra:mpd:gforker -CONFIGURE_ARGS+= --with-python=python${PYVERSSUFFIX} -PLIST.mpd= yes -REPLACE_PYTHON+= src/pm/mpd/*.py src/pm/mpd/test/*.py -.include "../../lang/python/application.mk" +#USE_LANGUAGES+= fortran77 +#CONFIGURE_ARGS+= --enable-fortran=f77 +CONFIGURE_ARGS+= --enable-fortran=no .endif diff --git a/parallel/mpi-ch/patches/patch-Makefile.in b/parallel/mpi-ch/patches/patch-Makefile.in index d977e34b051e..8069db46e555 100644 --- a/parallel/mpi-ch/patches/patch-Makefile.in +++ b/parallel/mpi-ch/patches/patch-Makefile.in @@ -1,57 +1,26 @@ -$NetBSD: patch-Makefile.in,v 1.2 2013/03/17 17:08:51 asau Exp $ +$NetBSD: patch-Makefile.in,v 1.3 2017/04/29 18:18:52 adam Exp $ ---- Makefile.in.orig 2012-12-20 21:29:15.000000000 +0100 -+++ Makefile.in 2013-01-24 16:33:41.164187741 +0100 -@@ -5985,6 +5985,7 @@ - srcdir = @srcdir@ - subdirs = @subdirs@ - sysconfdir = @sysconfdir@ -+sysconfexampledir = ${datadir}/examples - target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ -@@ -6163,9 +6164,9 @@ - src/mpid/ch3/errnames.txt $(am__append_52) \ - src/mpid/common/sock/errnames.txt $(am__append_87) \ - src/pmi/errnames.txt --external_subdirs = src/mpl src/openpa -+external_subdirs = src/mpl # src/openpa - # FIXME how/where does external_libs/ldflags get used? --external_ldflags = -L$(top_builddir)/src/mpl -L$(top_builddir)/src/openpa/src -+external_ldflags = -L$(top_builddir)/src/mpl # -L$(top_builddir)/src/openpa/src - external_libs = -lmpl -lopa $(am__append_12) $(am__append_13) - - # NOTE on our semi-unconventional usage of DIST_SUBDIRS: -@@ -23542,25 +23543,25 @@ - dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) - install-sysconfDATA: $(sysconf_DATA) - @$(NORMAL_INSTALL) -- @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ -+ @list='$(sysconf_DATA)'; test -n "$(sysconfexampledir)" || list=; \ - if test -n "$$list"; then \ -- echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(sysconfexampledir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(sysconfexampledir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ -- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \ -- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ -+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfexampledir)'"; \ -+ $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfexampledir)" || exit $$?; \ - done - - uninstall-sysconfDATA: - @$(NORMAL_UNINSTALL) -- @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ -+ @list='$(sysconf_DATA)'; test -n "$(sysconfexampledir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir) -+ dir='$(DESTDIR)$(sysconfexampledir)'; $(am__uninstall_files_from_dir) - install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ +Link mpiexec.gforker also against mpllib. +Do not create libopa symlink; it conflicts with parallel/openpa/PLIST. + +--- Makefile.in.orig 2015-11-12 04:08:10.000000000 +0000 ++++ Makefile.in +@@ -10241,7 +10242,7 @@ common_pm_includes = \ + # we may not want to add AM_CPPFLAGS for this program + @BUILD_PM_GFORKER_TRUE@@PRIMARY_PM_GFORKER_TRUE@src_pm_gforker_mpiexec_CPPFLAGS = $(common_pm_includes) $(AM_CPPFLAGS) + @BUILD_PM_GFORKER_TRUE@@PRIMARY_PM_GFORKER_FALSE@src_pm_gforker_mpiexec_gforker_SOURCES = src/pm/gforker/mpiexec.c +-@BUILD_PM_GFORKER_TRUE@@PRIMARY_PM_GFORKER_FALSE@src_pm_gforker_mpiexec_gforker_LDADD = src/pm/util/libmpiexec.a ++@BUILD_PM_GFORKER_TRUE@@PRIMARY_PM_GFORKER_FALSE@src_pm_gforker_mpiexec_gforker_LDADD = src/pm/util/libmpiexec.a $(mpllib) + # we may not want to add AM_CPPFLAGS for this program + @BUILD_PM_GFORKER_TRUE@@PRIMARY_PM_GFORKER_FALSE@src_pm_gforker_mpiexec_gforker_CPPFLAGS = $(common_pm_includes) $(AM_CPPFLAGS) + @BUILD_PM_REMSHELL_TRUE@@PRIMARY_PM_REMSHELL_TRUE@src_pm_remshell_mpiexec_SOURCES = src/pm/remshell/mpiexec.c +@@ -39783,9 +39784,6 @@ install-exec-hook: + if test "@MPILIBNAME@" != "mpl" ; then \ + cd ${DESTDIR}${libdir} && ln -f -s lib@MPILIBNAME@@SHLIB_EXT@ libmpl@SHLIB_EXT@ ; \ + fi ; \ +- if test "@MPILIBNAME@" != "opa" ; then \ +- cd ${DESTDIR}${libdir} && ln -f -s lib@MPILIBNAME@@SHLIB_EXT@ libopa@SHLIB_EXT@ ; \ +- fi ; \ + if test "@MPILIBNAME@" != "mpich" ; then \ + cd ${DESTDIR}${libdir} && ln -f -s lib@MPILIBNAME@@SHLIB_EXT@ libmpich@SHLIB_EXT@ ; \ + fi ; \ diff --git a/parallel/mpi-ch/patches/patch-configure b/parallel/mpi-ch/patches/patch-configure index 049b93324ace..5a3fad1fbb60 100644 --- a/parallel/mpi-ch/patches/patch-configure +++ b/parallel/mpi-ch/patches/patch-configure @@ -1,10 +1,20 @@ -$NetBSD: patch-configure,v 1.1 2013/04/20 17:39:01 asau Exp $ +$NetBSD: patch-configure,v 1.2 2017/04/29 18:18:52 adam Exp $ +Portability fix. Make it use weak symbols with Clang. ---- configure.orig 2013-03-28 21:03:38.000000000 +0000 +--- configure.orig 2015-11-12 04:08:11.000000000 +0000 +++ configure -@@ -27768,7 +27768,9 @@ else +@@ -26437,7 +26437,7 @@ if test -z "$BUILD_PAMID_TRUE"; then : + + + pamid_platform=${device_args} +-if test x"$pamid_platform" == "x"; then ++if test x"$pamid_platform" = "x"; then + case $host in #( + *-bgq-*) : + pamid_platform=BGQ ;; #( +@@ -29322,7 +29322,9 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ diff --git a/parallel/mpi-ch/patches/patch-src_mpi_romio_configure b/parallel/mpi-ch/patches/patch-src_mpi_romio_configure new file mode 100644 index 000000000000..674e2788d1b2 --- /dev/null +++ b/parallel/mpi-ch/patches/patch-src_mpi_romio_configure @@ -0,0 +1,15 @@ +$NetBSD: patch-src_mpi_romio_configure,v 1.1 2017/04/29 18:18:52 adam Exp $ + +Portability fix. + +--- src/mpi/romio/configure.orig 2017-04-28 20:33:04.000000000 +0000 ++++ src/mpi/romio/configure +@@ -22929,7 +22929,7 @@ if test "${with_aio_lite+set}" = set; th + withval=$with_aio_lite; with_aiolite=yes + fi + +-if test "x$with_aiolite" == xyes; then : ++if test "x$with_aiolite" = xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lio_listio in -laio-lite" >&5 + $as_echo_n "checking for lio_listio in -laio-lite... " >&6; } + if ${ac_cv_lib_aio_lite_lio_listio+:} false; then : diff --git a/parallel/mpi-ch/patches/patch-src_mpid_ch3_channels_nemesis_include_mpidi_ch3_impl.h b/parallel/mpi-ch/patches/patch-src_mpid_ch3_channels_nemesis_include_mpidi_ch3_impl.h index e5eee81d1b20..a6601aeb6aba 100644 --- a/parallel/mpi-ch/patches/patch-src_mpid_ch3_channels_nemesis_include_mpidi_ch3_impl.h +++ b/parallel/mpi-ch/patches/patch-src_mpid_ch3_channels_nemesis_include_mpidi_ch3_impl.h @@ -1,10 +1,10 @@ -$NetBSD: patch-src_mpid_ch3_channels_nemesis_include_mpidi_ch3_impl.h,v 1.1 2013/04/15 21:40:17 adam Exp $ +$NetBSD: patch-src_mpid_ch3_channels_nemesis_include_mpidi_ch3_impl.h,v 1.2 2017/04/29 18:18:52 adam Exp $ Use pthread_mutexattr_setpshared() only when available. ---- src/mpid/ch3/channels/nemesis/include/mpidi_ch3_impl.h.orig 2013-04-15 21:03:05.000000000 +0000 +--- src/mpid/ch3/channels/nemesis/include/mpidi_ch3_impl.h.orig 2015-11-10 02:39:01.000000000 +0000 +++ src/mpid/ch3/channels/nemesis/include/mpidi_ch3_impl.h -@@ -99,6 +99,7 @@ int MPIDI_CH3_SHM_Win_free(MPID_Win **wi +@@ -106,6 +106,7 @@ int MPIDI_CH3_SHM_Win_free(MPID_Win **wi "**pthread_unlock %s", strerror(pt_err)); \ } while (0) @@ -12,8 +12,8 @@ Use pthread_mutexattr_setpshared() only when available. #define MPIDI_CH3I_SHM_MUTEX_INIT(win_ptr) \ do { \ int pt_err; \ -@@ -117,6 +118,23 @@ int MPIDI_CH3_SHM_Win_free(MPID_Win **wi - MPIU_ERR_CHKANDJUMP1(pt_err, mpi_errno, MPI_ERR_OTHER, "**pthread_mutex", \ +@@ -124,6 +125,23 @@ int MPIDI_CH3_SHM_Win_free(MPID_Win **wi + MPIR_ERR_CHKANDJUMP1(pt_err, mpi_errno, MPI_ERR_OTHER, "**pthread_mutex", \ "**pthread_mutex %s", strerror(pt_err)); \ } while (0); +#else @@ -23,13 +23,13 @@ Use pthread_mutexattr_setpshared() only when available. + pthread_mutexattr_t attr; \ + \ + pt_err = pthread_mutexattr_init(&attr); \ -+ MPIU_ERR_CHKANDJUMP1(pt_err, mpi_errno, MPI_ERR_OTHER, "**pthread_mutex", \ ++ MPIR_ERR_CHKANDJUMP1(pt_err, mpi_errno, MPI_ERR_OTHER, "**pthread_mutex", \ + "**pthread_mutex %s", strerror(pt_err)); \ + pt_err = pthread_mutex_init((win_ptr)->shm_mutex, &attr); \ -+ MPIU_ERR_CHKANDJUMP1(pt_err, mpi_errno, MPI_ERR_OTHER, "**pthread_mutex", \ ++ MPIR_ERR_CHKANDJUMP1(pt_err, mpi_errno, MPI_ERR_OTHER, "**pthread_mutex", \ + "**pthread_mutex %s", strerror(pt_err)); \ + pt_err = pthread_mutexattr_destroy(&attr); \ -+ MPIU_ERR_CHKANDJUMP1(pt_err, mpi_errno, MPI_ERR_OTHER, "**pthread_mutex", \ ++ MPIR_ERR_CHKANDJUMP1(pt_err, mpi_errno, MPI_ERR_OTHER, "**pthread_mutex", \ + "**pthread_mutex %s", strerror(pt_err)); \ + } while (0); +#endif diff --git a/parallel/mpi-ch/patches/patch-src_mpid_ch3_channels_nemesis_src_ch3__init.c b/parallel/mpi-ch/patches/patch-src_mpid_ch3_channels_nemesis_src_ch3__init.c new file mode 100644 index 000000000000..d06a96007c31 --- /dev/null +++ b/parallel/mpi-ch/patches/patch-src_mpid_ch3_channels_nemesis_src_ch3__init.c @@ -0,0 +1,24 @@ +$NetBSD: patch-src_mpid_ch3_channels_nemesis_src_ch3__init.c,v 1.1 2017/04/29 18:18:52 adam Exp $ + +Use pthread_mutexattr_setpshared() only when available. + +--- src/mpid/ch3/channels/nemesis/src/ch3_init.c.orig 2017-04-29 16:30:18.534262462 +0000 ++++ src/mpid/ch3/channels/nemesis/src/ch3_init.c +@@ -52,6 +52,7 @@ static int split_type(MPID_Comm * comm_p + + int MPIDI_CH3I_Shm_supported(void) + { ++#ifdef _POSIX_THREAD_PROCESS_SHARED + int mutex_err; + pthread_mutexattr_t attr; + +@@ -63,6 +64,9 @@ int MPIDI_CH3I_Shm_supported(void) + pthread_mutexattr_destroy(&attr); + + return !mutex_err; ++#else ++ return 0; ++#endif + } + + static MPID_CommOps comm_fns = { diff --git a/parallel/mpi-ch/patches/patch-src_pm_hydra_configure b/parallel/mpi-ch/patches/patch-src_pm_hydra_configure index ba834d965e65..bf822fc77d2a 100644 --- a/parallel/mpi-ch/patches/patch-src_pm_hydra_configure +++ b/parallel/mpi-ch/patches/patch-src_pm_hydra_configure @@ -1,4 +1,6 @@ -$NetBSD: patch-src_pm_hydra_configure,v 1.2 2013/03/17 17:08:52 asau Exp $ +$NetBSD: patch-src_pm_hydra_configure,v 1.3 2017/04/29 18:18:52 adam Exp $ + +Last newline is not needed. --- src/pm/hydra/configure.orig 2012-12-20 21:28:12.000000000 +0100 +++ src/pm/hydra/configure 2013-01-24 15:36:08.260189221 +0100