git: 1bcedd2d66a8 - main - Mk/Uses/mpi.mk: revert c9a111c1f2ce by marking MPICH libraries as private
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 28 Dec 2022 16:56:18 UTC
The branch main has been updated by thierry:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1bcedd2d66a8edc15a075d4a9c383a5627a46306
commit 1bcedd2d66a8edc15a075d4a9c383a5627a46306
Author: Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2022-12-28 16:51:02 +0000
Commit: Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2022-12-28 16:51:02 +0000
Mk/Uses/mpi.mk: revert c9a111c1f2ce by marking MPICH libraries as private
Mark the libraries brought by MPICH dependencies as private, in order to
avoid to register them.
Patch provided by tijl@.
---
Mk/Uses/mpi.mk | 7 +------
net/mpich/Makefile | 1 +
net/mpich/files/patch-src-packaging-pkgconfig-mpich.pc.in | 12 ++++++++++++
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/Mk/Uses/mpi.mk b/Mk/Uses/mpi.mk
index 2d9987bbbebc..29c417ce62f8 100644
--- a/Mk/Uses/mpi.mk
+++ b/Mk/Uses/mpi.mk
@@ -28,12 +28,7 @@ USES+= pkgconfig
. endif
. if ${mpi_ARGS} == mpich
-LIB_DEPENDS+= libmpich.so:net/mpich \
- libhwloc.so:devel/hwloc2 \
- libjson-c.so:devel/json-c \
- libfabric.so:net/libfabric \
- libze_loader.so:devel/level-zero\
- libepoll-shim.so:devel/libepoll-shim
+LIB_DEPENDS+= libmpich.so:net/mpich
MPI_HOME= ${LOCALBASE}
MPI_LIBS+= `pkgconf --libs mpich`
. if ${USES:Mfortran}
diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index d3298e7410ad..5ea3cb59a771 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -1,5 +1,6 @@
PORTNAME= mpich
PORTVERSION= 3.4.3
+PORTREVISION= 1
CATEGORIES= net parallel
MASTER_SITES= https://www.mpich.org/static/downloads/${DISTVERSION}/
diff --git a/net/mpich/files/patch-src-packaging-pkgconfig-mpich.pc.in b/net/mpich/files/patch-src-packaging-pkgconfig-mpich.pc.in
new file mode 100644
index 000000000000..0dce6dc7928f
--- /dev/null
+++ b/net/mpich/files/patch-src-packaging-pkgconfig-mpich.pc.in
@@ -0,0 +1,12 @@
+--- src/packaging/pkgconfig/mpich.pc.in.orig 2021-12-16 16:59:29 UTC
++++ src/packaging/pkgconfig/mpich.pc.in
+@@ -9,7 +9,8 @@ Requires:
+ Version: @MPICH_VERSION@
+ URL: http://www.mcs.anl.gov/research/projects/mpich
+ Requires:
+-Libs: @WRAPPER_C_DYNAMIC_LOADING_FLAGS@ @WRAPPER_LDFLAGS@ -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@ @WRAPPER_LIBS@
++Libs: @WRAPPER_C_DYNAMIC_LOADING_FLAGS@ @WRAPPER_LDFLAGS@ -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@
++Libs.private: @WRAPPER_LIBS@
+ Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I${includedir}
+
+ # pkg-config does not understand Cxxflags, etc. So we allow users to