Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 Oct 2017 12:19:20 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r452975 - head/science/meep
Message-ID:  <201710271219.v9RCJKeg039150@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Fri Oct 27 12:19:20 2017
New Revision: 452975
URL: https://svnweb.freebsd.org/changeset/ports/452975

Log:
  Fix options usage.
  
  You cannot set a variable after any include and use it in options, as
  options is one of the few things that are done very very early.
  
  PR:		223071
  Reported by:	antoine
  Sponsored by:	Absolight

Modified:
  head/science/meep/Makefile   (contents, props changed)

Modified: head/science/meep/Makefile
==============================================================================
--- head/science/meep/Makefile	Fri Oct 27 12:19:16 2017	(r452974)
+++ head/science/meep/Makefile	Fri Oct 27 12:19:20 2017	(r452975)
@@ -27,14 +27,11 @@ MAKE_ARGS+=	CC="${CC}" CXX="${CXX}"
 
 OPTIONS_RADIO=		MPI
 OPTIONS_RADIO_MPI=	OPENMPI MPICH2
-OPTIONS_DEFAULT=	${MPI_DEFAULT}
+OPTIONS_DEFAULT=	${OPTIONS_DEFAULT_${OPSYS}}
+OPTIONS_DEFAULT_FreeBSD=	MPICH2
 OPENMPI_DESC=		MPI support (with OpenMPI)
 
 .include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD
-MPI_DEFAULT=	MPICH2
-.endif
 
 .if ${PORT_OPTIONS:MMPICH2} || ${PORT_OPTIONS:MOPENMPI}
 CONFIGURE_ARGS+=	--with-mpi



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