From 02365bbb65cd1ee2941e305f2b80cbf231991162 Mon Sep 17 00:00:00 2001
From: jrm <jrm@FreeBSD.org>
Date: Thu, 8 Jun 2017 19:37:02 +0000
Subject: science/hypre: Fix build with openmpi

- specify full path to mpicc/mpicxx when setting CC/CXX
- specify mpi include/lib dirs
- set WRKSRC_SUBDIR instead of WRKSRC
- whitespace changes

Approved by:	pfg (maintainer)
---
 science/hypre/Makefile | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'science/hypre')

diff --git a/science/hypre/Makefile b/science/hypre/Makefile
index 96f9cb75f679..d3a47365fa25 100644
--- a/science/hypre/Makefile
+++ b/science/hypre/Makefile
@@ -16,21 +16,27 @@ USES=		blaslapack fortran localbase
 
 USE_LDCONFIG=	yes
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
+WRKSRC_SUBDIR=	src
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-blas --with-blas-lib=${BLASLIB} \
 		--with-lapack --with-lapack-lib=${LAPACKLIB} \
 		--enable-shared
-CONFIGURE_ENV=	CC=mpicc CXX=mpicxx
 
-OPTIONS_DEFINE=	DOCS
-OPTIONS_SINGLE=	MPI
+OPTIONS_DEFINE=		DOCS
+OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	MPICH2 OPENMPI
 OPTIONS_DEFAULT=	MPICH2
 
 MPICH2_LIB_DEPENDS=	libmpich.so.8:net/mpich2
+MPICH2_CONFIGURE_ENV=	CC=${LOCALBASE}/bin/mpicc CXX=${LOCALBASE}/bin/mpicxx
+MPICH2_CONFIGURE_WITH=	MPI-include=${LOCALBASE}/include \
+			MPI-lib-dirs=${LOCALBASE}/lib
 OPENMPI_LIB_DEPENDS=	libmpi.so:net/openmpi
+OPENMPI_CONFIGURE_ENV=	CC=${LOCALBASE}/mpi/openmpi/bin/mpicc \
+			CXX=${LOCALBASE}/mpi/openmpi/bin/mpicxx
+OPENMPI_CONFIGURE_WITH=	MPI-include=${LOCALBASE}/mpi/openmpi/include \
+			MPI-lib-dirs=${LOCALBASE}/mpi/openmpi/lib
 
 .ifdef MAINTAINER_MODE
 TEST_TARGET=	check
-- 
cgit