Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 7 Mar 2021 22:11:56 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r567626 - head/science/pnetcdf
Message-ID:  <202103072211.127MBu95034203@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sun Mar  7 22:11:56 2021
New Revision: 567626
URL: https://svnweb.freebsd.org/changeset/ports/567626

Log:
  Simplify Makefile
  
  - Use shared OPENMPI_DESC
  - Remove OPENMPI3 option

Modified:
  head/science/pnetcdf/Makefile

Modified: head/science/pnetcdf/Makefile
==============================================================================
--- head/science/pnetcdf/Makefile	Sun Mar  7 22:11:50 2021	(r567625)
+++ head/science/pnetcdf/Makefile	Sun Mar  7 22:11:56 2021	(r567626)
@@ -16,7 +16,7 @@ USES=		fortran gmake pathfix perl5 tar:bzip2
 USE_PERL5=	build
 
 CFLAGS+=	-fPIC
-CONFIGURE_ARGS=	ac_cv_fc_compiler_nag=no
+CONFIGURE_ARGS=	--with-mpi=${MPI_HOME} ac_cv_fc_compiler_nag=no
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
@@ -26,17 +26,11 @@ CONFLICTS_INSTALL=	hdf-4.*
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SINGLE=	MPI
-OPTIONS_SINGLE_MPI=	OPENMPI OPENMPI3 MPICH
+OPTIONS_SINGLE_MPI=	OPENMPI MPICH
 OPTIONS_DEFAULT=OPENMPI
-OPENMPI_DESC=	Parallel processing support via Open MPI (current)
-OPENMPI3_DESC=	Parallel processing support via Open MPI 3.x
 
-MPICH_CONFIGURE_ON=	--with-mpi=${LOCALBASE}
-MPICH_LIB_DEPENDS=	libmpich.so:net/mpich
-OPENMPI_CONFIGURE_ON=	--with-mpi=${LOCALBASE}/mpi/openmpi
-OPENMPI_LIB_DEPENDS=	libmpi.so:net/openmpi
-OPENMPI3_CONFIGURE_ON=	--with-mpi=${LOCALBASE}/mpi/openmpi3
-OPENMPI3_LIB_DEPENDS=	libmpi.so:net/openmpi3
+MPICH_USES=	mpi:mpich
+OPENMPI_USES=	mpi:openmpi
 
 .include <bsd.port.pre.mk>
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103072211.127MBu95034203>