Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 2 Mar 2021 21:19:29 +0000 (UTC)
From:      Thierry Thomas <thierry@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r566987 - head/net/py-mpi4py
Message-ID:  <202103022119.122LJT3E063412@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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}



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