From owner-svn-ports-head@freebsd.org Sat Jun 18 17:46:32 2016 Return-Path: Delivered-To: svn-ports-head@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 8E61CA79233; Sat, 18 Jun 2016 17:46:32 +0000 (UTC) (envelope-from dbn@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 6650F2074; Sat, 18 Jun 2016 17:46:32 +0000 (UTC) (envelope-from dbn@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5IHkVag055921; Sat, 18 Jun 2016 17:46:31 GMT (envelope-from dbn@FreeBSD.org) Received: (from dbn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5IHkVQH055916; Sat, 18 Jun 2016 17:46:31 GMT (envelope-from dbn@FreeBSD.org) Message-Id: <201606181746.u5IHkVQH055916@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbn set sender to dbn@FreeBSD.org using -f From: David Naylor Date: Sat, 18 Jun 2016 17:46:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417077 - in head: Mk/Uses math/R math/R-cran-MCMCpack math/R-cran-RcppArmadillo X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jun 2016 17:46:32 -0000 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@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 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 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 .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