From owner-svn-ports-all@freebsd.org  Thu Jun  8 19:37:03 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C1E01C78758;
 Thu,  8 Jun 2017 19:37:03 +0000 (UTC) (envelope-from jrm@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8FC276ECED;
 Thu,  8 Jun 2017 19:37:03 +0000 (UTC) (envelope-from jrm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v58Jb2AT049757;
 Thu, 8 Jun 2017 19:37:02 GMT (envelope-from jrm@FreeBSD.org)
Received: (from jrm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v58Jb2LH049756;
 Thu, 8 Jun 2017 19:37:02 GMT (envelope-from jrm@FreeBSD.org)
Message-Id: <201706081937.v58Jb2LH049756@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org
 using -f
From: Joseph Mingrone <jrm@FreeBSD.org>
Date: Thu, 8 Jun 2017 19:37:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r442952 - head/science/hypre
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2017 19:37:03 -0000

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