[146923] trunk/dports/science/octopus/Portfile

[dstrubbe at macports.org]

Revision: 146923
          https://trac.macports.org/changeset/146923
Author:   dstrubbe at macports.org
Date:     2016-03-20 15:47:49 -0700 (Sun, 20 Mar 2016)
Log Message:
-----------
octopus: Fix capitalization of -lvecLibFort. Add +threads variant, using threads in ATLAS too.

Modified Paths:
--------------
    trunk/dports/science/octopus/Portfile

Modified: trunk/dports/science/octopus/Portfile
===================================================================
--- trunk/dports/science/octopus/Portfile	2016-03-20 22:19:00 UTC (rev 146922)
+++ trunk/dports/science/octopus/Portfile	2016-03-20 22:47:49 UTC (rev 146923)
@@ -64,8 +64,6 @@
     configure.args-append  --enable-mpi
 }
 
-# More options that could be added:
-# variants: openmp, threads (for fftw, atlas?)
 # no way to turn off PAPI, but there is no port for this anyway.
 
 # libxc does not have universal variant, so octopus cannot either
@@ -100,6 +98,10 @@
     configure.args-append --enable-newuoa
 }
 
+variant threads description {Build with OpenMP and threaded libraries} {
+    configure.args-append --enable-openmp
+}
+
 variant netcdf description {Build with support for NetCDF output} {
     configure.args-delete   --with-netcdf-prefix=no
     configure.args-append   --with-netcdf-prefix=${prefix}
@@ -148,13 +150,17 @@
 
 # choose one of the following for serial linear algebra
 variant accelerate conflicts atlas openblas description {Build with linear algebra from built-in Accelerate framework} {
-    depends_lib-append      port:veclibfort
-    configure.args-append   --with-blas=-lveclibfort
+    depends_lib-append      port:vecLibFort
+    configure.args-append   --with-blas=-lvecLibFort
 }
 
 variant atlas conflicts accelerate openblas description {Build with linear algebra from ATLAS} {
     depends_lib-append      port:atlas
-    configure.args-append   --with-blas=-lsatlas
+    if {[variant_isset threads]} {
+        configure.args-append   --with-blas=-ltatlas
+    } else {
+        configure.args-append   --with-blas=-lsatlas
+    }
 }
 
 variant openblas conflicts accelerate atlas description {Build with linear algebra from OpenBLAS} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160320/ce40e397/attachment-0001.html>