Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Apr 2026 02:00:34 +0000
From:      Laurent Chardon <laurent@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 63a7b4ce30c4 - main - net/mpich: Update to 5.0.1
Message-ID:  <69dd9fc2.19920.4c7730bf@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by laurent:

URL: https://cgit.FreeBSD.org/ports/commit/?id=63a7b4ce30c482fade65dd7466a1d13c50f80efb

commit 63a7b4ce30c482fade65dd7466a1d13c50f80efb
Author:     Laurent Chardon <laurent@FreeBSD.org>
AuthorDate: 2026-04-14 01:59:59 +0000
Commit:     Laurent Chardon <laurent@FreeBSD.org>
CommitDate: 2026-04-14 01:59:59 +0000

    net/mpich: Update to 5.0.1
    
    Changes: https://www.mpich.org/2026/04/10/mpich-5-0-1-released/
    
    Fix Process Manager logic
    Fix PLIST_SUB logic
    Fix Makefile format with portfmt
    
    Reviewed by:    thierry (mentor)
    Approved by:    thierry (mentor)
    Differential Revision:  https://reviews.freebsd.org/D56358
---
 net/mpich/Makefile  | 104 ++++++++++++++++++++++++++--------------------------
 net/mpich/distinfo  |   6 +--
 net/mpich/pkg-plist |   8 ++--
 3 files changed, 60 insertions(+), 58 deletions(-)

diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index da514fd3d094..24cd54602a3d 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	mpich
-DISTVERSION=	5.0.0
+DISTVERSION=	5.0.1
 CATEGORIES=	net parallel
 MASTER_SITES=	https://github.com/pmodels/mpich/releases/download/v${DISTVERSION}/
 
@@ -12,30 +12,35 @@ LICENSE_NAME=	MPICH
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libhwloc.so:devel/hwloc2	\
-		libjson-c.so:devel/json-c	\
-		libfabric.so:net/libfabric	\
-		libepoll-shim.so:devel/libepoll-shim
+LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
+		libfabric.so:net/libfabric \
+		libhwloc.so:devel/hwloc2 \
+		libjson-c.so:devel/json-c
 
 USES=		compiler:c11 libtool localbase perl5 pkgconfig python:build
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fast="" \
-		--with-libfabric=${LOCALBASE} \
-		--with-libfabric-include=${WRKDIR}/include \
 		--with-hwloc=${LOCALBASE} \
-		pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
-		MPICHLIB_CFLAGS="${CFLAGS}" \
+		--with-libfabric-include=${WRKDIR}/include \
+		--with-libfabric=${LOCALBASE} \
+		BASH_SHELL=${LOCALBASE}/bin/bash \
 		CFLAGS="-I${LOCALBASE}/include/json-c ${CFLAGS_F2018}" \
-		MPICHLIB_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="" \
-		MPICHLIB_CXXFLAGS="${CXXFLAGS}" CXXFLAGS="" \
-		MPICHLIB_FFLAGS="${FFLAGS}" FFLAGS="" \
-		MPICHLIB_FCFLAGS="${FCFLAGS}" FCFLAGS="" \
-		MPICHLIB_LDFLAGS="${LDFLAGS}" LDFLAGS="" \
-		MPICHLIB_LIBS="${LIBS}" \
+		CPPFLAGS="" \
+		CXXFLAGS="" \
+		FCFLAGS="" \
+		FFLAGS="" \
+		LDFLAGS="" \
 		LIBS="-L${LOCALBASE}/lib -lepoll-shim -ljson-c -lm" \
-		BASH_SHELL=${LOCALBASE}/bin/bash
+		MPICHLIB_CFLAGS="${CFLAGS}" \
+		MPICHLIB_CPPFLAGS="${CPPFLAGS}" \
+		MPICHLIB_CXXFLAGS="${CXXFLAGS}" \
+		MPICHLIB_FCFLAGS="${FCFLAGS}" \
+		MPICHLIB_FFLAGS="${FFLAGS}" \
+		MPICHLIB_LDFLAGS="${LDFLAGS}" \
+		MPICHLIB_LIBS="${LIBS}" \
+		pkgconfigdir="${PREFIX}/libdata/pkgconfig"
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
@@ -45,13 +50,13 @@ CONFLICTS=	mpd
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 PORTDOCS=	*
 
-OPTIONS_DEFINE=		DOCS FORTRAN SLURM L0
-OPTIONS_DEFAULT=	FORTRAN GFORKER HYDRA DHYDRA
-OPTIONS_GROUP=		PM
-OPTIONS_GROUP_PM=	GFORKER HYDRA
-OPTIONS_RADIO=		DEFAULTPM
-OPTIONS_RADIO_DEFAULTPM=DGFORKER DHYDRA
-OPTIONS_SUB=		yes
+OPTIONS_DEFINE=			DOCS FORTRAN L0 SLURM
+OPTIONS_DEFAULT=		DHYDRA FORTRAN GFORKER HYDRA
+OPTIONS_GROUP=			PM
+OPTIONS_GROUP_PM=		GFORKER HYDRA
+OPTIONS_RADIO=			DEFAULTPM
+OPTIONS_RADIO_DEFAULTPM=	DGFORKER DHYDRA
+OPTIONS_SUB=			yes
 
 DEFAULTPM_DESC=	Default process manager
 DGFORKER_DESC=	Make gforker the default process manager
@@ -62,14 +67,14 @@ L0_DESC=	oneAPI Level Zero support
 PM_DESC=	Process managers
 SLURM_DESC=	Extra Slurm support
 
-MPICH_LDFLAGS=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
-		-L${LOCALBASE}/lib/gcc${_GCC_VER} -B${LOCALBASE}/bin
+MPICH_LDFLAGS=			-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
+				-L${LOCALBASE}/lib/gcc${_GCC_VER} \
+				-B${LOCALBASE}/bin
 FORTRAN_USES=			fortran
-FORTRAN_CONFIGURE_ON=		\
-	MPICH_MPICC_LDFLAGS="${MPICH_LDFLAGS}" \
-	MPICH_MPICXX_LDFLAGS="${MPICH_LDFLAGS}" \
-	MPICH_MPIF77_LDFLAGS="${MPICH_LDFLAGS}" \
-	MPICH_MPIFORT_LDFLAGS="${MPICH_LDFLAGS}"
+FORTRAN_CONFIGURE_ON=		MPICH_MPICC_LDFLAGS="${MPICH_LDFLAGS}" \
+				MPICH_MPICXX_LDFLAGS="${MPICH_LDFLAGS}" \
+				MPICH_MPIF77_LDFLAGS="${MPICH_LDFLAGS}" \
+				MPICH_MPIFORT_LDFLAGS="${MPICH_LDFLAGS}"
 FORTRAN_CONFIGURE_ENABLE=	fortran
 L0_LIB_DEPENDS=			libze_loader.so:devel/level-zero
 L0_CONFIGURE_WITH=		ze
@@ -81,39 +86,36 @@ SLURM_CONFIGURE_WITH=		slurm
 
 .if ${PORT_OPTIONS:ML0}
 # PR 278869 - level-zero is broken
-IGNORE=	is currently not working with the L0 option. Unset L0
+IGNORE=		is currently not working with the L0 option. Unset L0
 .endif
 
-.if ${COMPILER_TYPE} == clang && (${COMPILER_VERSION} == 170 || ${COMPILER_VERSION} >= 181 && ${ARCH} == "i386")
+.if ${COMPILER_TYPE} == clang && (${COMPILER_VERSION} == 170 || \
+	${COMPILER_VERSION} >= 181 && ${ARCH} == "i386")
 # linker error when compiling with llvm 17.0.6 on CURRENT - PR 276035
 # To be removed when all RELEASE and CURRENT no longer need it
 # Error remains for i386 and llvm-181 on CURRENT
 CONFIGURE_ENV+=	ac_cv_sizeof___float128=0
 .endif
 
-.for pm in ${OPTIONS_GROUP_PM}
-. if ${PORT_OPTIONS:M${pm}}
-.  if empty(PMLIST)
-PMLIST=		${pm:tl}
-.  elif ${PORT_OPTIONS:MD${pm}}
-PMLIST:=	${pm:tl},${PMLIST}
-.  else
-PMLIST:=	${PMLIST},${pm:tl}
-.  endif
+.if ${PORT_OPTIONS:MGFORKER}
+PMLIST=		gforker
+.endif
+.if ${PORT_OPTIONS:MHYDRA}
+. if empty(PMLIST)
+PMLIST=		hydra
+. elif ${PORT_OPTIONS:MDGFORKER}
+PMLIST:=		${PMLIST},hydra
+. elif ${PORT_OPTIONS:MDHYDRA}
+PMLIST:=		hydra,${PMLIST}
 . endif
-.endfor
+.endif
 
 .if empty(PMLIST)
-CONFIGURE_ARGS+=--without-pm
-PLIST_SUB+=	EXEC="@comment " EXECGFORKER="@comment "
-.else
-CONFIGURE_ARGS+=--with-pm=${PMLIST}
-PLIST_SUB+=	EXEC=""
-.if ${PMLIST:M*,gforker*}
-PLIST_SUB+=	EXECGFORKER=""
+CONFIGURE_ARGS+=	--without-pm
+PLIST_SUB+=		EXEC="@comment "
 .else
-PLIST_SUB+=	EXECGFORKER="@comment "
-.endif
+CONFIGURE_ARGS+=	--with-pm=${PMLIST}
+PLIST_SUB+=		EXEC=""
 .endif
 
 post-extract:
diff --git a/net/mpich/distinfo b/net/mpich/distinfo
index 06a709d991f6..dfa70fd7c1d5 100644
--- a/net/mpich/distinfo
+++ b/net/mpich/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1770465962
-SHA256 (mpich-5.0.0.tar.gz) = e9350e32224283e95311f22134f36c98e3cd1c665d17fae20a6cc92ed3cffe11
-SIZE (mpich-5.0.0.tar.gz) = 37638722
+TIMESTAMP = 1775840815
+SHA256 (mpich-5.0.1.tar.gz) = 8c1832a13ddacf071685069f5fadfd1f2877a29e1a628652892c65211b1f3327
+SIZE (mpich-5.0.1.tar.gz) = 37688810
diff --git a/net/mpich/pkg-plist b/net/mpich/pkg-plist
index 8415452accd9..144f623c424b 100644
--- a/net/mpich/pkg-plist
+++ b/net/mpich/pkg-plist
@@ -6,7 +6,7 @@ bin/mpicc
 bin/mpichversion
 bin/mpicxx
 %%EXEC%%bin/mpiexec
-%%EXECGFORKER%%bin/mpiexec.gforker
+%%GFORKER%%bin/mpiexec.gforker
 %%HYDRA%%bin/mpiexec.hydra
 %%FORTRAN%%bin/mpif77
 %%FORTRAN%%bin/mpif90
@@ -39,18 +39,18 @@ include/mpicxx.h
 lib/libmpi.a
 lib/libmpi.so
 lib/libmpi.so.12
-lib/libmpi.so.12.6.0
+lib/libmpi.so.12.6.1
 lib/libmpich.so
 lib/libmpichcxx.so
 %%FORTRAN%%lib/libmpichf90.so
 lib/libmpicxx.a
 lib/libmpicxx.so
 lib/libmpicxx.so.12
-lib/libmpicxx.so.12.6.0
+lib/libmpicxx.so.12.6.1
 %%FORTRAN%%lib/libmpifort.a
 %%FORTRAN%%lib/libmpifort.so
 %%FORTRAN%%lib/libmpifort.so.12
-%%FORTRAN%%lib/libmpifort.so.12.6.0
+%%FORTRAN%%lib/libmpifort.so.12.6.1
 lib/libmpl.so
 lib/libopa.so
 libdata/pkgconfig/mpich.pc


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69dd9fc2.19920.4c7730bf>