From nobody Wed Dec 28 16:56:18 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NhyN30nqGz2kYw8; Wed, 28 Dec 2022 16:56:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NhyN30HZrz3sBv; Wed, 28 Dec 2022 16:56:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672246579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KqOOtll4Q/4/7PWB+Tw3vq4ySvGHJnm1xkyFoNyWrnk=; b=I5ONAEZcQHuXCRSzN4rBtvMujUu0cyiwpX+6eEGCM8vQeYz27B+JLfZnhmWd29nptKsHhL r9xoSpnVtkJpCByxXUPhMWyMr+hY3y5dE2F83G5S/nIlcGYuomNDWpflajEwdHL0zOIVgI H7KpDi3XiCDF3Nz4zGFWRYNxl+HTfgai+ADdtMXmh1LTeUqfK3Vx/48XYav8mKyNtDvDoX nrmHd8rt+O5XSVnNscw+MM3sSAR86jP8klhfRyJG3Rf7NcIlnWkZpipUvTmJnruGAvOqWX 03j3EuqEEBWySiDwUnVhik/uTiXALzMJrvsGglAh6lA1Tip518pmJfL6Tpoeqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672246579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KqOOtll4Q/4/7PWB+Tw3vq4ySvGHJnm1xkyFoNyWrnk=; b=RoLt2kzkI+wO3dwgZRPnaNIJJoe3vvmOSupig14OSmVgeq+LfOgOzeVcTdB2GOY1RouWW+ ws7UnKRk9dXq3h1ucrzfGPNKu38XANbYllA0G9W4rrOhlreNeniyziYrBG1Gx2dMeYpGER +j0Y8hRLTW/NPZ/0BaJyJqMFFtjI0TSP6eA//Y/gjxAlnuEgkgz0FJxZr2g7muUWf612Sc NWD2J2qwY4dilBEQDQeFlJVnHR979uM9iFgCbXbYHmITAOGqBX8/OHEBbfZldrCe/jPhjL jPFzLzzFbaf75ffcr86e6zs6+VwEw0VK6R228MpMouqIKU48xmbR7FWXH6YSqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672246579; a=rsa-sha256; cv=none; b=GJ6RtmFcy/nZ1jKIVmXPTJsEiSDOx6E8Xj3H8CVexsfxmU6SBxo5eooKyPJvV9v6DiIOkb etuzjOWLDMrr7q2kNC6k61om13xdcBD7DXTw/djy4aE5qK7qhPqsnqsMNciBbxoCdynqv4 n7xdQVN5c+QgZBC+5kznc1BV2+XBPHCmKheZ5XxeFwfEXGkDLtauJwd668j1QXC9ICaTgM nBtuwo1OSlnPjw9uOAf5MzNWkSWcfL8VbtbXgWqVhqntr32RzFgPnXJIg+ecIkGX8IROmT UPzB2fzj8JFICx1e0HMqtodakiMkUenQBVSvzj6Ee1Enc1r0Nqr8p1kL4uXKcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NhyN26S2qzwmR; Wed, 28 Dec 2022 16:56:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BSGuIK3036093; Wed, 28 Dec 2022 16:56:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BSGuIIa036092; Wed, 28 Dec 2022 16:56:18 GMT (envelope-from git) Date: Wed, 28 Dec 2022 16:56:18 GMT Message-Id: <202212281656.2BSGuIIa036092@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 1bcedd2d66a8 - main - Mk/Uses/mpi.mk: revert c9a111c1f2ce by marking MPICH libraries as private List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1bcedd2d66a8edc15a075d4a9c383a5627a46306 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=1bcedd2d66a8edc15a075d4a9c383a5627a46306 commit 1bcedd2d66a8edc15a075d4a9c383a5627a46306 Author: Thierry Thomas AuthorDate: 2022-12-28 16:51:02 +0000 Commit: Thierry Thomas 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