Page MenuHomeFreeBSD

D57058.diff
No OneTemporary

D57058.diff

diff --git a/Mk/Uses/mpi.mk b/Mk/Uses/mpi.mk
--- a/Mk/Uses/mpi.mk
+++ b/Mk/Uses/mpi.mk
@@ -5,7 +5,7 @@
# Valid ARGS: mpich (default) openmpi
#
# Provides: MPI_LIBS MPI_CFLAGS MPICC MPICXX MPIF90 MPIFC MPI_HOME \
-# MPIEXEC MPIRUN
+# MPI4PY MPIEXEC MPIRUN
# Sets: LIB_DEPENDS
# + CMAKE_ARGS if cmake is enabled to drive FindMPI.cmake
#
@@ -27,7 +27,7 @@
. endif
. if ${mpi_ARGS} == mpich
-LIB_DEPENDS+= libmpich.so:net/mpich
+LIB_DEPENDS+= libmpi.so:net/mpich
MPI_HOME= ${LOCALBASE}
MPI_LIBS+= `pkgconf --libs mpich`
MPI4PY= ${PYTHON_PKGNAMEPREFIX}mpi4py-mpich>0:net/py-mpi4py-mpich@${PY_FLAVOR}
@@ -39,9 +39,9 @@
MPI_CFLAGS+= `pkgconf --cflags mpich`
. elif ${mpi_ARGS} == openmpi
. if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc
-LIB_DEPENDS+= libmpi_cxx.so:net/openmpi4
+LIB_DEPENDS+= libmpi.so:net/openmpi4
. else
-LIB_DEPENDS+= libmpi_mpifh.so:net/openmpi
+LIB_DEPENDS+= libmpi.so:net/openmpi
. endif
MPI_HOME= ${LOCALBASE}/mpi/openmpi
MPI4PY= ${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 21, 9:45 AM (3 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37027573
Default Alt Text
D57058.diff (1 KB)

Event Timeline