<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/135a599bbda1a20fa7b48d7c4ba4d9d4055b49f7">https://github.com/macports/macports-ports/commit/135a599bbda1a20fa7b48d7c4ba4d9d4055b49f7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 135a599bbda1a20fa7b48d7c4ba4d9d4055b49f7
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Oct 22 20:24:13 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> linear_algebra PG: change variables into options
</span>---
_resources/port1.0/group/linear_algebra-1.0.tcl | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/linear_algebra-1.0.tcl b/_resources/port1.0/group/linear_algebra-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index a7ca63b..a766a2d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/linear_algebra-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/linear_algebra-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,6 +22,10 @@
</span>
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+options linalglib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ blas_only \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ noveclibfort
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> default linalglib ""
default blas_only 0
default noveclibfort 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +35,9 @@ proc linalg.setup {args} {
</span>
foreach v $args {
if {$v == "blas_only"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set blas_only 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ blas_only 1
</span> } elseif {$v == "noveclibfort"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set noveclibfort 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ noveclibfort 1
</span> } else {
ui_error "Internal error: Unknown argument '$v' to linalg.setup."
return -code error "Internal error: Unknown argument '$v' to linalg.setup."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,18 +53,18 @@ if {![variant_isset accelerate] && ![variant_isset atlas] && ![variant_isset ope
</span> variant accelerate conflicts atlas openblas description {Build with linear algebra from built-in Accelerate framework} {
if {$noveclibfort == 0} {
depends_lib-append port:vecLibFort
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set linalglib -lvecLibFort
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ linalglib -lvecLibFort
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set linalglib "-framework Accelerate"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ linalglib -framework Accelerate
</span> }
}
variant atlas conflicts accelerate openblas description {Build with linear algebra from ATLAS} {
depends_lib-append port:atlas
if {[variant_isset threads]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set linalglib -ltatlas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ linalglib -ltatlas
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set linalglib -lsatlas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ linalglib -lsatlas
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +74,7 @@ variant openblas conflicts accelerate atlas description {Build with linear algeb
</span> if {$blas_only == 0} {
require_active_variants path:lib/libopenblas.dylib:OpenBLAS lapack
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set linalglib -lopenblas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ linalglib -lopenblas
</span> }
if {![variant_isset accelerate] && ![variant_isset openblas] && ![variant_isset atlas] } {
</pre><pre style='margin:0'>
</pre>