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

[dstrubbe at macports.org]

Revision: 148835
          https://trac.macports.org/changeset/148835
Author:   dstrubbe at macports.org
Date:     2016-05-19 12:11:35 -0700 (Thu, 19 May 2016)
Log Message:
-----------
octopus: Use new linear_algebra port group.

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

Modified: trunk/dports/science/octopus/Portfile
===================================================================
--- trunk/dports/science/octopus/Portfile	2016-05-19 19:10:03 UTC (rev 148834)
+++ trunk/dports/science/octopus/Portfile	2016-05-19 19:11:35 UTC (rev 148835)
@@ -3,6 +3,7 @@
 
 PortSystem          1.0
 PortGroup           mpi 1.0
+PortGroup           linear_algebra 1.0
 
 name                octopus
 version             5.0.1
@@ -28,10 +29,10 @@
 # clang38: errors on operate.o
 compiler.blacklist  macports-clang-3.8
 
-# no acceptable way to set FCCPP for gcc5 or gcc6 though gfortran is ok;
+# no acceptable way to set FCCPP for gcc5, gcc6, gcc7 though gfortran is ok;
 # clang versions are unnecessary
 # dragonegg34-gcc46 segfaults on varia.c
-mpi.setup           require_fortran -dragonegg34 -gcc5 -gcc6 -clang
+mpi.setup           require_fortran -dragonegg34 -gcc5 -gcc6 -gcc7 -clang
 
 # this incorrectly passes if libxc +gcc5, octopus +mpich, mpich-default +gcc49
 compilers.enforce_fortran libxc
@@ -51,9 +52,6 @@
 configure.optflags  -O3
 
 default_variants +newuoa
-if {![variant_isset accelerate] && ![variant_isset atlas] && ![variant_isset openblas]} {
-    default_variants-append +accelerate
-}
 
 # FIXME: does fortran default variant not happen in time to make fftw-3 get
 # installed +gcc48?
@@ -64,6 +62,10 @@
     configure.args-append  --enable-mpi
 }
 
+pre-configure {
+    configure.args-append --with-blas="-L${prefix}/lib ${linalglib}"
+}
+
 # no way to turn off PAPI, but there is no port for this anyway.
 
 # libxc does not have universal variant, so octopus cannot either
@@ -148,28 +150,6 @@
     mpi.enforce_variant     scalapack
 }
 
-# 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
-}
-
-variant atlas conflicts accelerate openblas description {Build with linear algebra from ATLAS} {
-    depends_lib-append      port:atlas
-    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} {
-    # allow OpenBLAS-devel too
-    depends_lib-append      path:lib/libopenblas.dylib:OpenBLAS
-    require_active_variants path:lib/libopenblas.dylib:OpenBLAS lapack
-    configure.args-append   --with-blas=-lopenblas
-}
-
 variant pfft description {Build with PFFT} {
     depends_lib-append      port:pfft
     configure.args-delete   --with-pfft-prefix=no
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160519/e09be0e4/attachment.html>