diff options
| author | dbn <dbn@FreeBSD.org> | 2016-06-19 01:46:30 +0800 |
|---|---|---|
| committer | dbn <dbn@FreeBSD.org> | 2016-06-19 01:46:30 +0800 |
| commit | fafc5ff3f7d51e63467b964958c8d9ba8c3a1b31 (patch) | |
| tree | ad3188d35580628f258de0dc4d3d2e98d040ab55 /math | |
| parent | ed642d871401453348d735a366faf71a0578a0ba (diff) | |
| download | freebsd-ports-gnome-fafc5ff3f7d51e63467b964958c8d9ba8c3a1b31.tar.gz freebsd-ports-gnome-fafc5ff3f7d51e63467b964958c8d9ba8c3a1b31.tar.zst freebsd-ports-gnome-fafc5ff3f7d51e63467b964958c8d9ba8c3a1b31.zip | |
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)
Diffstat (limited to 'math')
| -rw-r--r-- | math/R-cran-MCMCpack/Makefile | 4 | ||||
| -rw-r--r-- | math/R-cran-RcppArmadillo/Makefile | 3 | ||||
| -rw-r--r-- | math/R/Makefile | 2 | ||||
| -rw-r--r-- | math/R/compiler.mk | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/math/R-cran-MCMCpack/Makefile b/math/R-cran-MCMCpack/Makefile index dc33fbf468ae..6bc975bc9795 100644 --- a/math/R-cran-MCMCpack/Makefile +++ b/math/R-cran-MCMCpack/Makefile @@ -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> diff --git a/math/R-cran-RcppArmadillo/Makefile b/math/R-cran-RcppArmadillo/Makefile index 557cb2f7d79c..042e52041746 100644 --- a/math/R-cran-RcppArmadillo/Makefile +++ b/math/R-cran-RcppArmadillo/Makefile @@ -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> diff --git a/math/R/Makefile b/math/R/Makefile index 9bba13b53bd1..2988d60bedd9 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -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" diff --git a/math/R/compiler.mk b/math/R/compiler.mk new file mode 100644 index 000000000000..6a3352b0d345 --- /dev/null +++ b/math/R/compiler.mk @@ -0,0 +1,2 @@ +# Compiler settings required for R and the R-cran ports. +USE_GCC= yes |