mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-31 10:46:16 +00:00
Code Issues Releases Activity

- Fix build with OpenMPI 4 and swap from net/openmpi3 to net/openmpi

Browse Source
This commit is contained in:
Danilo Egea Gondolfo 2020-04-21 20:35:34 +00:00
parent eec8cf3df9
commit 15352b139f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=532418
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
math/blacs/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= blacs
PORTVERSION= 1.7
PORTREVISION= 36
PORTREVISION= 37
CATEGORIES= math
MASTER_SITES= NETLIB/blacs
DISTNAME= BLACS
@ -26,7 +26,7 @@ OPTIONS_DEFAULT= DOCS MPICH
DOCS_DISTFILES= blacs_install.ps f77blacsqref.ps lawn94.ps \
cblacsqref.ps mpi_prop.ps mpiblacs_issues.ps
OPENMPI_LIB_DEPENDS= libmpi.so:net/openmpi3
OPENMPI_LIB_DEPENDS= libmpi.so:net/openmpi
OPENMPI_EXTRA_PATCHES= ${FILESDIR}/Bmake.inc-openmpi.diff
MPICH_LIB_DEPENDS= libmpich.so:net/mpich2

10
math/blacs/files/Bmake.inc-openmpi.diff
View File

@ -32,7 +32,7 @@
# -------------------------------------
- MPIdir = /usr/local/mpich
- MPILIBdir = $(MPIdir)/lib/
+ MPIdir = @LOCALBASE@/mpi/openmpi3
+ MPIdir = @LOCALBASE@/mpi/openmpi
+ MPILIBdir =
MPIINCdir = $(MPIdir)/include
- MPILIB = $(MPILIBdir)/libmpich.a
@ -78,14 +78,14 @@
- CC = gcc
- CCFLAGS = -O4
- CCLOADER = $(CC)
+ F77 = @LOCALBASE@/mpi/openmpi3/bin/mpif77
+ F77 = @LOCALBASE@/mpi/openmpi/bin/mpif77
+ F77NO_OPTFLAGS = @F77EXTRAFLAGS@
+ F77FLAGS = @FFLAGS@
+ F77LOADER = @LOCALBASE@/mpi/openmpi3/bin/mpif77
+ F77LOADER = @LOCALBASE@/mpi/openmpi/bin/mpif77
+ F77LOADFLAGS = @FFLAGS@
+ CC = @LOCALBASE@/mpi/openmpi3/bin/mpicc
+ CC = @LOCALBASE@/mpi/openmpi/bin/mpicc
+ CCFLAGS = @CFLAGS@
+ CCLOADER = @LOCALBASE@/mpi/openmpi3/bin/mpicc
+ CCLOADER = @LOCALBASE@/mpi/openmpi/bin/mpicc
CCLOADFLAGS =
-
# --------------------------------------------------------------------------

14
math/blacs/files/patch-SRC_MPI_Bdef.h Normal file
View File

@ -0,0 +1,14 @@
--- SRC/MPI/Bdef.h.orig 2020-04-21 20:22:36 UTC
+++ SRC/MPI/Bdef.h
@@ -1605,9 +1605,9 @@ int BI_ContxtNum();
#else
#define BI_MPI_Type_struct(count_, lens_, disps_, types_, newtype_, ierr_) \
{ \
- (ierr_) = MPI_Type_struct((count_), (lens_), (disps_), (types_), \
+ (ierr_) = MPI_Type_create_struct((count_), (lens_), (disps_), (types_), \
(newtype_)); \
- Mmpierror((ierr_), "MPI_Type_struct", NULL, __LINE__, __FILE__); \
+ Mmpierror((ierr_), "MPI_Type_create_struct", NULL, __LINE__, __FILE__); \
}
#endif