Revision: 144070 https://trac.macports.org/changeset/144070 Author: mmoll@macports.org Date: 2015-12-31 07:56:33 -0800 (Thu, 31 Dec 2015) Log Message: ----------- math/arpack: restore openblas variant now that openblas has lapack variant enabled by default. use active_variants port group to check for that. Modified Paths: -------------- trunk/dports/math/arpack/Portfile Modified: trunk/dports/math/arpack/Portfile =================================================================== --- trunk/dports/math/arpack/Portfile 2015-12-31 15:43:20 UTC (rev 144069) +++ trunk/dports/math/arpack/Portfile 2015-12-31 15:56:33 UTC (rev 144070) @@ -2,13 +2,14 @@ # $Id$ PortSystem 1.0 +PortGroup active_variants 1.1 PortGroup muniversal 1.0 PortGroup mpi 1.0 PortGroup github 1.0 github.setup opencollab arpack-ng 3.3.0 name arpack -revision 0 +revision 1 categories math license BSD platforms darwin @@ -60,7 +61,7 @@ set universal_archs_supported "ppc ppc64" } -variant accelerate conflicts atlas description {build with Accelerate framework} { +variant accelerate conflicts atlas openblas description {build with Accelerate framework} { # the change of LDFLAGS is required to avoid linking against the ATLAS ones # if they are present; if we specify /usr/lib/libblas.dylib directly, the # linking fails. http://forge.scilab.org/index.php/p/arpack-ng/issues/1220/ @@ -68,19 +69,18 @@ configure.args-append LDFLAGS='/usr/lib/libblas.dylib /usr/lib/liblapack.dylib' --with-blas="-lblas -llapack" } -variant atlas conflicts accelerate description {build with atlas} { +variant atlas conflicts accelerate openblas description {build with atlas} { depends_lib-append port:atlas configure.args-append --with-blas="-L${prefix}/lib -lsatlas" } -# OpenBlas doesn't appear to have the cheev function. -# Renable variant when it does, add variant conflicts, and update default_variant logic below -# variant openblas conflicts accelerate atlas description {build with openblas} { -# depends_lib-append path:lib/libopenblas.dylib:OpenBLAS -# configure.args-append --with-blas="-L${prefix}/lib -lopenblas" -# } +variant openblas conflicts accelerate atlas description {build with openblas} { + require_active_variants openblas lapack + depends_lib-append path:lib/libopenblas.dylib:OpenBLAS + configure.args-append --with-blas="-L${prefix}/lib -lopenblas" +} -if {![variant_isset atlas]} { +if {![variant_isset atlas] && ![variant_isset openblas]} { default_variants +accelerate }