Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mpich: Update to 3.2.1. #38

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions parallel/mpi-ch/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.85 2018/08/22 09:46:10 wiz Exp $

DISTNAME= mpich-3.2
PKGREVISION= 1
DISTNAME= mpich-3.2.1
CATEGORIES= parallel
MASTER_SITES= http://www.mpich.org/static/tarballs/${PKGVERSION_NOREV}/

Expand Down Expand Up @@ -31,9 +30,7 @@ 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"
CONFIGURE_ARGS+= --enable-wrapper-rpath

LDFLAGS+= -lm

Expand Down
2 changes: 2 additions & 0 deletions parallel/mpi-ch/PLIST
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ man/man1/mpicxx.1
man/man1/mpiexec.1
man/man1/mpif77.1
man/man1/mpifort.1
man/man3/Constants.3
man/man3/MPIX_Comm_agree.3
man/man3/MPIX_Comm_failure_ack.3
man/man3/MPIX_Comm_failure_get_acked.3
Expand Down Expand Up @@ -448,6 +449,7 @@ 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/Constants.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
Expand Down
10 changes: 5 additions & 5 deletions parallel/mpi-ch/distinfo
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
$NetBSD: distinfo,v 1.26 2017/04/29 18:18:52 adam Exp $

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 (mpich-3.2.1.tar.gz) = 24c53333927d1760db78be2b9ef217f4f3dcf771
RMD160 (mpich-3.2.1.tar.gz) = b830ba3f5cb5401c03898ad9abf87c60d5cf1e50
SHA512 (mpich-3.2.1.tar.gz) = 659a11cf02302f27eb1db77667dd4c7a4f8008b1d73f5f0f0f28ee6b5d9cca2130bac3d010a132136ba15a25a738ec9cbda67255133aeb42f0d82a2ded23d23d
Size (mpich-3.2.1.tar.gz) = 11908154 bytes
SHA1 (patch-Makefile.in) = 7fee6ae5e86943f7ea1b3eef103c5b5b4b66490b
SHA1 (patch-configure) = 00c5706f825dbadeb544d14ee98a1a27e49d0797
SHA1 (patch-src_mpi_romio_configure) = a517932dd1af1cc0da889b838fd732a5fb766910
SHA1 (patch-src_mpid_ch3_channels_nemesis_include_mpidi_ch3_impl.h) = ec7d063fb22fbfb3fc1ee85197afd6f4c4db22bd
Expand Down
10 changes: 0 additions & 10 deletions parallel/mpi-ch/patches/patch-Makefile.in
Original file line number Diff line number Diff line change
@@ -1,19 +1,9 @@
$NetBSD: patch-Makefile.in,v 1.3 2017/04/29 18:18:52 adam Exp $

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@ ; \
Expand Down