[141257] trunk/dports/science/octopus

[dstrubbe at macports.org]

Revision: 141257
          https://trac.macports.org/changeset/141257
Author:   dstrubbe at macports.org
Date:     2015-10-13 13:15:11 -0700 (Tue, 13 Oct 2015)
Log Message:
-----------
octopus: Add variants to choose between ATLAS (previous default), Accelerate, and OpenBLAS for serial linear algebra. Remove unused patch mistakenly added before.

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

Removed Paths:
-------------
    trunk/dports/science/octopus/files/patch-m4-metis.m4.diff

Modified: trunk/dports/science/octopus/Portfile
===================================================================
--- trunk/dports/science/octopus/Portfile	2015-10-13 20:01:04 UTC (rev 141256)
+++ trunk/dports/science/octopus/Portfile	2015-10-13 20:15:11 UTC (rev 141257)
@@ -33,10 +33,10 @@
 mpi.setup           require_fortran -dragonegg34 -gcc5 -gcc6 -clang
 compilers.enforce_fortran libxc
 
-depends_lib         port:atlas port:libxc port:fftw-3 port:gsl
+depends_lib         port:libxc port:fftw-3 port:gsl
 # openblas or accelerate/veclibfort instead of atlas?
 
-configure.args      --with-libxc-prefix=${prefix} --with-blas=-lsatlas \
+configure.args      --with-libxc-prefix=${prefix} \
                     --disable-gdlib --without-sparskit --with-netcdf-prefix=no \
                     --with-etsf-io-prefix=no --with-berkeleygw-prefix=no \
                     --with-arpack=no --with-parpack=no --with-feast=no \
@@ -48,6 +48,10 @@
 configure.optflags  -O3
 
 default_variants +newuoa
+if {![variant_isset accelerate] && ![variant_isset openblas]} {
+    default_variants-append +atlas
+}
+
 # FIXME: does fortran default variant not happen in time to make fftw-3 get
 # installed +gcc48?
 # gfortran -> gfortran5?
@@ -150,6 +154,24 @@
     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
+    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
+}
+
 livecheck.type      regex
 livecheck.url       ${homepage}/wiki/index.php/Main_Page
 livecheck.regex     ${name} (\[0-9.\]+)

Deleted: trunk/dports/science/octopus/files/patch-m4-metis.m4.diff
===================================================================
--- trunk/dports/science/octopus/files/patch-m4-metis.m4.diff	2015-10-13 20:01:04 UTC (rev 141256)
+++ trunk/dports/science/octopus/files/patch-m4-metis.m4.diff	2015-10-13 20:15:11 UTC (rev 141257)
@@ -1,39 +0,0 @@
---- m4/metis.m4.orig	2015-02-26 16:20:51.000000000 -0500
-+++ m4/metis.m4	2015-10-09 10:46:57.000000000 -0400
-@@ -15,7 +15,7 @@
- ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- ## 02110-1301, USA.
- ##
--## $Id: metis.m4 13225 2015-02-26 21:20:25Z dstrubbe $
-+## $Id: metis.m4 14659 2015-10-09 14:17:20Z dstrubbe $
- ##
- 
- AC_DEFUN([ACX_PATH_METIS], [
-@@ -31,15 +31,15 @@
-   AC_REQUIRE([AC_PROG_CC])
- 
-   AC_ARG_WITH([metis-prefix],
--    [AC_HELP_STRING([--with-metis-prefix],
-+    [AS_HELP_STRING([--with-metis-prefix=DIR],
-     [Directory where external METIS library was installed (must be single-precision)])])
- 
-   case $with_metis_prefix in
--    no ) acx_external_metis=disabled ;;
-+    no ) acx_external_metis=no ;;
-     "") with_metis_prefix="/usr" ;;
-   esac
- 
--  if test x"$acx_external_metis" != xdisabled; then
-+  if test x"$acx_external_metis" != xno; then
-   
-     dnl Backup CFLAGS and LIBS
-     acx_metis_save_CFLAGS="$CFLAGS"
-@@ -86,6 +86,8 @@
- 
-     CFLAGS="$acx_metis_save_CFLAGS"
-     LIBS="$acx_metis_save_LIBS"
-+  else
-+    AC_MSG_RESULT([disabled])
-   fi
- 
-   if test x"$acx_external_metis" = xno ; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151013/021d7d78/attachment.html>