Date: Tue, 21 Apr 2020 20:35:35 +0000 (UTC) From: Danilo Egea Gondolfo <danilo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r532418 - in head/math/blacs: . files Message-ID: <202004212035.03LKZZia039613@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danilo Date: Tue Apr 21 20:35:34 2020 New Revision: 532418 URL: https://svnweb.freebsd.org/changeset/ports/532418 Log: - Fix build with OpenMPI 4 and swap from net/openmpi3 to net/openmpi Added: head/math/blacs/files/patch-SRC_MPI_Bdef.h (contents, props changed) Modified: head/math/blacs/Makefile head/math/blacs/files/Bmake.inc-openmpi.diff Modified: head/math/blacs/Makefile ============================================================================== --- head/math/blacs/Makefile Tue Apr 21 20:24:20 2020 (r532417) +++ head/math/blacs/Makefile Tue Apr 21 20:35:34 2020 (r532418) @@ -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 Modified: head/math/blacs/files/Bmake.inc-openmpi.diff ============================================================================== --- head/math/blacs/files/Bmake.inc-openmpi.diff Tue Apr 21 20:24:20 2020 (r532417) +++ head/math/blacs/files/Bmake.inc-openmpi.diff Tue Apr 21 20:35:34 2020 (r532418) @@ -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 = - # -------------------------------------------------------------------------- Added: head/math/blacs/files/patch-SRC_MPI_Bdef.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/blacs/files/patch-SRC_MPI_Bdef.h Tue Apr 21 20:35:34 2020 (r532418) @@ -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 +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004212035.03LKZZia039613>