Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Dec 2023 17:08:55 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 003d02547265 - main - net/mpich: Revert dependency changes
Message-ID:  <202312301708.3BUH8t2m087622@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=003d02547265d581b5defeea24580c5d9277235b

commit 003d02547265d581b5defeea24580c5d9277235b
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-12-30 17:01:44 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-12-30 17:05:15 +0000

    net/mpich: Revert dependency changes
    
    Revert "net/mpich: fix build by removal of hydra from pkg-plist"
    
    This reverts commit 531052cb22f42acc476e0b15379db24115b683f1.
    
    Revert "net/mpich: Update dependency"
    
    This reverts commit 78bb85928c8845e2f3ccd78dc68bd2e7184a9339.
    
    sysutils/torque is required by mpich.
    
    Reported by:    thierry
---
 net/mpich/Makefile  | 12 ++++++++----
 net/mpich/pkg-plist |  8 ++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index 0e7c1c372e75..f97f283e6faa 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mpich
 PORTVERSION=	4.1.2
-PORTREVISION=	2
+PORTREVISION=	1
 CATEGORIES=	net parallel
 MASTER_SITES=	https://www.mpich.org/static/downloads/${DISTVERSION}/
 
@@ -33,10 +33,10 @@ BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 OPTIONS_DEFINE=		DOCS FORTRAN L0
 OPTIONS_GROUP=		PM
-OPTIONS_GROUP_PM=	GFORKER
+OPTIONS_GROUP_PM=	GFORKER HYDRA
 OPTIONS_RADIO=		DEFAULTPM
-OPTIONS_RADIO_DEFAULTPM=DGFORKER
-OPTIONS_DEFAULT=	FORTRAN GFORKER DGFORKER L0
+OPTIONS_RADIO_DEFAULTPM=DGFORKER DHYDRA
+OPTIONS_DEFAULT=	FORTRAN GFORKER HYDRA DHYDRA L0
 OPTIONS_SUB=		yes
 
 FORTRAN_USES=			fortran
@@ -51,8 +51,12 @@ MPICH_LDFLAGS=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
 
 PM_DESC=	Process managers
 GFORKER_DESC=	Simple local process manager
+HYDRA_DESC=	Parallel process manager
 DEFAULTPM_DESC=	Default process manager
 DGFORKER_DESC=	Make gforker the default process manager
+DHYDRA_DESC=	Make hydra the default process manager
+
+HYDRA_LIB_DEPENDS=	libtorque.so:sysutils/torque
 
 L0_DESC=		oneAPI Level Zero support
 L0_LIB_DEPENDS=		libze_loader.so:devel/level-zero
diff --git a/net/mpich/pkg-plist b/net/mpich/pkg-plist
index ba2c9b260e10..82339b2ab27a 100644
--- a/net/mpich/pkg-plist
+++ b/net/mpich/pkg-plist
@@ -1,12 +1,17 @@
+%%HYDRA%%bin/hydra_nameserver
+%%HYDRA%%bin/hydra_persist
+%%HYDRA%%bin/hydra_pmi_proxy
 bin/mpic++
 bin/mpicc
 bin/mpichversion
 bin/mpicxx
 %%EXEC%%bin/mpiexec
 %%EXECGFORKER%%bin/mpiexec.gforker
+%%HYDRA%%bin/mpiexec.hydra
 %%FORTRAN%%bin/mpif77
 %%FORTRAN%%bin/mpif90
 %%FORTRAN%%bin/mpifort
+%%HYDRA%%bin/mpirun
 bin/mpivars
 bin/parkill
 %%FORTRAN%%include/mpi_c_interface.mod
@@ -49,6 +54,9 @@ lib/libmpicxx.so.12.3.1
 lib/libmpl.so
 lib/libopa.so
 libdata/pkgconfig/mpich.pc
+man/man1/hydra_nameserver.1.gz
+man/man1/hydra_persist.1.gz
+man/man1/hydra_pmi_proxy.1.gz
 man/man1/mpicc.1.gz
 man/man1/mpicxx.1.gz
 man/man1/mpiexec.1.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202312301708.3BUH8t2m087622>