svn commit: r417077 - in head: Mk/Uses math/R math/R-cran-MCMCpack math/R-cran-RcppArmadillo

[David Naylor]

Author: dbn
Date: Sat Jun 18 17:46:30 2016
New Revision: 417077
URL: https://svnweb.freebsd.org/changeset/ports/417077

Log:
  Mk/Uses/cran: add "compiles" argument.
  
  [1] Add "compiles" argument to cran to allow R-cran ports need to compile
  code to bring in the correct compiler dependencies.  Also, ensure
  consistency between the compiler selected by the R port and the R-cran ports.
  
  [2] Migrate R-cran ports that manually specify the compiler to
  USES=cran,compiles.
  
  PR:		210343
  Approved by:	wen (1), portmgr (2, blanket)

Added:
  head/math/R/compiler.mk   (contents, props changed)
Modified:
  head/Mk/Uses/cran.mk
  head/math/R-cran-MCMCpack/Makefile
  head/math/R-cran-RcppArmadillo/Makefile
  head/math/R/Makefile

Modified: head/Mk/Uses/cran.mk
==============================================================================
--- head/Mk/Uses/cran.mk	Sat Jun 18 16:03:17 2016	(r417076)
+++ head/Mk/Uses/cran.mk	Sat Jun 18 17:46:30 2016	(r417077)
@@ -4,9 +4,10 @@
 #
 # Feature:	cran
 # Usage:	USES=cran or USES=cran:ARGS
-# Valid ARGS:	auto-plist
+# Valid ARGS:	auto-plist, compiles
 #
-# auto-plist	The pkg-plist can be automatically compiled
+# auto-plist	The pkg-plist is to be automatically generated
+# compiles	The port has code that needs to be compiled
 #
 # MAINTAINER=	wen at FreeBSD.org
 
@@ -76,4 +77,8 @@ cran-auto-plist:
 		${SED} -E -e 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
 .endif
 
+.if ${cran_ARGS:Mcompiles}
+.include "${PORTSDIR}/math/R/compiler.mk"
+.endif
+
 .endif #_INCLUDE_USES_CRAN_MK

Modified: head/math/R-cran-MCMCpack/Makefile
==============================================================================
--- head/math/R-cran-MCMCpack/Makefile	Sat Jun 18 16:03:17 2016	(r417076)
+++ head/math/R-cran-MCMCpack/Makefile	Sat Jun 18 17:46:30 2016	(r417077)
@@ -14,8 +14,6 @@ LICENSE=	GPLv3
 
 RUN_DEPENDS=	R-cran-coda>0.11.3:math/R-cran-coda
 
-# Actually required 4.0 or later.
-USE_GCC=	any
-USES=	cran:auto-plist
+USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>

Modified: head/math/R-cran-RcppArmadillo/Makefile
==============================================================================
--- head/math/R-cran-RcppArmadillo/Makefile	Sat Jun 18 16:03:17 2016	(r417076)
+++ head/math/R-cran-RcppArmadillo/Makefile	Sat Jun 18 17:46:30 2016	(r417077)
@@ -13,7 +13,6 @@ LICENSE=	GPLv2+
 
 RUN_DEPENDS=	R-cran-Rcpp>=0.11.0:devel/R-cran-Rcpp
 
-USES=	cran:auto-plist
-USE_GCC=	yes
+USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>

Modified: head/math/R/Makefile
==============================================================================
--- head/math/R/Makefile	Sat Jun 18 16:03:17 2016	(r417076)
+++ head/math/R/Makefile	Sat Jun 18 17:46:30 2016	(r417077)
@@ -107,8 +107,8 @@ RBLAS_SOVERSION=	2
 RLAPACK_SOVERSION=	4
 RMATH_SOVERSION=	0
 USES+=			fortran
-USE_GCC=		yes
 
+.include "${.CURDIR}/compiler.mk"
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "sparc64" || ${ARCH} == "powerpc64"

Added: head/math/R/compiler.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/R/compiler.mk	Sat Jun 18 17:46:30 2016	(r417077)
@@ -0,0 +1,2 @@
+# Compiler settings required for R and the R-cran ports.
+USE_GCC=	yes