From owner-svn-ports-all@freebsd.org Tue Mar 2 21:19:29 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9B0E555113E; Tue, 2 Mar 2021 21:19:29 +0000 (UTC) (envelope-from thierry@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 4Dqql53x4bz3N5D; Tue, 2 Mar 2021 21:19:29 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 79D9D1DB2D; Tue, 2 Mar 2021 21:19:29 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 122LJTrr063413; Tue, 2 Mar 2021 21:19:29 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 122LJT3E063412; Tue, 2 Mar 2021 21:19:29 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <202103022119.122LJT3E063412@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Tue, 2 Mar 2021 21:19:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566987 - head/net/py-mpi4py X-SVN-Group: ports-head X-SVN-Commit-Author: thierry X-SVN-Commit-Paths: head/net/py-mpi4py X-SVN-Commit-Revision: 566987 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2021 21:19:29 -0000 Author: thierry Date: Tue Mar 2 21:19:28 2021 New Revision: 566987 URL: https://svnweb.freebsd.org/changeset/ports/566987 Log: Set USES=mpi, and replace MPICH2 by MPICH. Modified: head/net/py-mpi4py/Makefile Modified: head/net/py-mpi4py/Makefile ============================================================================== --- head/net/py-mpi4py/Makefile Tue Mar 2 21:18:43 2021 (r566986) +++ head/net/py-mpi4py/Makefile Tue Mar 2 21:19:28 2021 (r566987) @@ -15,24 +15,25 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.rst USES= python:3.6+ USE_PYTHON= distutils cython autoplist concurrent +LDFLAGS+= ${MPI_LIBS} OPTIONS_DEFINE= DOCS MANPAGES OPTIONS_SINGLE= MP -OPTIONS_SINGLE_MP= MPICH2 OPENMPI +OPTIONS_SINGLE_MP= MPICH OPENMPI OPTIONS_DEFAULT= OPENMPI # the only non-failing MPI implementation MP_DESC= MPI Implementation -MPICH2_USES= fortran -MPICH2_LIB_DEPENDS= libmpich.so:net/mpich2 -MPICH2_LDFLAGS= ${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so +MPICH_USES= fortran mpi:mpich +MPICH_LDFLAGS= ${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so -OPENMPI_LIB_DEPENDS= libmpi.so:net/openmpi +OPENMPI_USES= mpi:openmpi PORTDOCS= * -do-patch-OPENMPI-on: - @${CP} ${FILESDIR}/mpi.cfg ${WRKSRC}/ - @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/mpi.cfg +pre-configure: + ${CP} ${FILESDIR}/mpi.cfg ${WRKSRC}/ + ${REINPLACE_CMD} -e 's|%%LOCALBASE%%/mpi/openmpi|${MPI_HOME}|' \ + ${WRKSRC}/mpi.cfg do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}