svn commit: r442952 - head/science/hypre

[Joseph Mingrone]

Author: jrm
Date: Thu Jun  8 19:37:02 2017
New Revision: 442952
URL: https://svnweb.freebsd.org/changeset/ports/442952

Log:
  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)

Modified:
  head/science/hypre/Makefile

Modified: head/science/hypre/Makefile
==============================================================================
--- head/science/hypre/Makefile	Thu Jun  8 19:33:40 2017	(r442951)
+++ head/science/hypre/Makefile	Thu Jun  8 19:37:02 2017	(r442952)
@@ -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