diff options
| author | Danilo Egea Gondolfo <danilo@FreeBSD.org> | 2020-04-21 21:22:12 +0000 |
|---|---|---|
| committer | Danilo Egea Gondolfo <danilo@FreeBSD.org> | 2020-04-21 21:22:12 +0000 |
| commit | 1a1473bfc42f6b2dd0e83ab2da4eb2c2a6ffc4b4 (patch) | |
| tree | 61d77e2862402fb8b3ee098dc9f89921735207ba /math/scalapack | |
| parent | - New port: www/py-secure-cookie (diff) | |
- Fix build with OpenMPI 4 and swap from net/openmpi3 to net/openmpi
Notes
Notes:
svn path=/head/; revision=532422
Diffstat (limited to 'math/scalapack')
| -rw-r--r-- | math/scalapack/Makefile | 20 | ||||
| -rw-r--r-- | math/scalapack/files/pkg-message.in | 4 |
2 files changed, 16 insertions, 8 deletions
diff --git a/math/scalapack/Makefile b/math/scalapack/Makefile index 7543d8863a2e..55598f865773 100644 --- a/math/scalapack/Makefile +++ b/math/scalapack/Makefile @@ -3,7 +3,7 @@ PORTNAME= scalapack PORTVERSION= 2.0.2 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= math MASTER_SITES= NL DISTFILES= scalapack-${PORTVERSION}.tgz manpages.tgz @@ -50,9 +50,9 @@ ATLAS_LIB_DEPENDS= libatlas.so:math/atlas BLAS_LIB_DEPENDS= libblas.so:math/blas \ liblapack.so:math/lapack -OPENMPI_BUILD_DEPENDS= openmpi3>0:net/openmpi3 -OPENMPI_RUN_DEPENDS= openmpi3>0:net/openmpi3 -OPENMPI_CMAKE_ON= -DMPI_BASE_DIR=${LOCALBASE}/mpi/openmpi3 +OPENMPI_BUILD_DEPENDS= openmpi>0:net/openmpi +OPENMPI_RUN_DEPENDS= openmpi>0:net/openmpi +OPENMPI_CMAKE_ON= -DMPI_BASE_DIR=${LOCALBASE}/mpi/openmpi MPICH_BUILD_DEPENDS= ${LOCALBASE}/bin/mpicc:net/mpich MPICH_RUN_DEPENDS= ${LOCALBASE}/bin/mpicc:net/mpich @@ -69,8 +69,8 @@ LAPACK= -llapack .endif .if ${PORT_OPTIONS:MOPENMPI} -MPIF77= ${LOCALBASE}/mpi/openmpi3/bin/mpif77 -MPICC= ${LOCALBASE}/mpi/openmpi3/bin/mpicc +MPIF77= ${LOCALBASE}/mpi/openmpi/bin/mpif77 +MPICC= ${LOCALBASE}/mpi/openmpi/bin/mpicc .else MPIF77= ${LOCALBASE}/bin/mpif77 MPICC= ${LOCALBASE}/bin/mpicc @@ -105,6 +105,14 @@ NOOPT= -O0 # assume mpicc points to a compatible compiler and force that, too. CC= ${MPICC} +post-patch: + ${REINPLACE_CMD} -e 's|MPI_Type_struct|MPI_Type_create_struct|' \ + ${WRKSRC}/BLACS/SRC/igamx2d_.c ${WRKSRC}/BLACS/SRC/cgamn2d_.c \ + ${WRKSRC}/BLACS/SRC/dgamn2d_.c ${WRKSRC}/BLACS/SRC/zgamn2d_.c \ + ${WRKSRC}/BLACS/SRC/sgamn2d_.c ${WRKSRC}/BLACS/SRC/igamn2d_.c \ + ${WRKSRC}/BLACS/SRC/cgamx2d_.c ${WRKSRC}/BLACS/SRC/dgamx2d_.c \ + ${WRKSRC}/BLACS/SRC/zgamx2d_.c ${WRKSRC}/BLACS/SRC/sgamx2d_.c + pre-configure: ${CP} -p ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist ${CP} ${WRKSRC}/SLmake.inc.example ${WRKSRC}/SLmake.inc diff --git a/math/scalapack/files/pkg-message.in b/math/scalapack/files/pkg-message.in index 8d050f8f8fde..77fcda0ea8fe 100644 --- a/math/scalapack/files/pkg-message.in +++ b/math/scalapack/files/pkg-message.in @@ -24,8 +24,8 @@ If you're using OpenMPI, use this instead: % cd %%DATADIR%%/TESTING - % LD_LIBRARY_PATH=%%LOCALBASE%%/mpi/openmpi3/lib/ export LD_LIBRARY_PATH - % PATH=$PATH:%%LOCALBASE%%/mpi/openmpi3/bin/ export PATH + % LD_LIBRARY_PATH=%%LOCALBASE%%/mpi/openmpi/lib/ export LD_LIBRARY_PATH + % PATH=$PATH:%%LOCALBASE%%/mpi/openmpi/bin/ export PATH % mpirun -np 4 ./xcbrd % mpirun -np 4 ./xcdblu etc., etc. ... |