[143305] trunk/dports/math/itsol/Portfile

[dstrubbe at macports.org]

Revision: 143305
          https://trac.macports.org/changeset/143305
Author:   dstrubbe at macports.org
Date:     2015-12-09 19:21:32 -0800 (Wed, 09 Dec 2015)
Log Message:
-----------
itsol: Use vecLibFort for Accelerate, which should resolve the concerns about its bugginess. I don't see any problem for g95, since atlas does not need to be installed with the same Fortran compiler as used here; all tests passed regardless. Use more condensed link line for atlas.

Modified Paths:
--------------
    trunk/dports/math/itsol/Portfile

Modified: trunk/dports/math/itsol/Portfile
===================================================================
--- trunk/dports/math/itsol/Portfile	2015-12-10 03:15:59 UTC (rev 143304)
+++ trunk/dports/math/itsol/Portfile	2015-12-10 03:21:32 UTC (rev 143305)
@@ -42,34 +42,15 @@
 compilers.choose    fc
 compilers.setup     require_fortran
 
-# atlas does not provide a +g95 variant, so if +g95 is used,
-# +accelerate must also be used.  +accelerate will work with +gccXY,
-# so this is all a bit complex to check for.  Setting 'requires' here
-# does not yet seem to work with 'port' to get [+]accelerate; leaving
-# it out does work, so doing that and checking for this condition
-# later, for now.
-
-######################
-# set up BLAS variants
-
-# atlas does not work with g95, so always conflict with it
-
 variant atlas description {use BLAS from MacPorts' atlas port} \
-    conflicts g95 accelerate {}
+    conflicts accelerate {}
 
-# accelerate works with any fortran variant
-
 variant accelerate description \
-    {use BLAS from Apple's Accelerate.framework [might be buggy]} \
+    {use BLAS from Apple's Accelerate.framework} \
     conflicts atlas {}
 
-##################
-# variant checking
-
-# check for BLAS default variant, use +atlas if nothing else
-
 set blas_variant_selection ""
-if {[variant_isset g95] || [variant_isset accelerate]} {
+if {[variant_isset accelerate]} {
     set blas_variant_selection "accelerate"
 } else {
     set blas_variant_selection "atlas"
@@ -89,12 +70,13 @@
 
 if {[variant_isset accelerate]} {
 
-    configure.ldflags-append -Wl,-framework -Wl,Accelerate
+    depends_lib-append        vecLibFort
+    configure.ldflags-append  -lvecLibFort
 
 } else {
 
     depends_lib-append       port:atlas
-    configure.ldflags-append -llapack -lcblas -lf77blas -latlas
+    configure.ldflags-append -lsatlas
 
 }
 
@@ -108,18 +90,6 @@
 configure.universal_args
 destroot.env-append  PREFIX=${prefix}
 
-pre-fetch {
-
-    # check for +accelerate.  Apple's VecLib has bugs that can cause
-    # crashes, while Atlas does not have these issues.  Print a
-    # warning if this variant is in use, but do not force the use of
-    # +atlas (for now).
-
-    if {[variant_isset accelerate]} {
-        ui_msg "\nWARNING: The +accelerate variant has been selected, using Apple's Vector Libraries which have known bugs that can cause crashes.  The +atlas variant does not have these issues, and is generally considered a better way to go.\n"
-    }
-}
-
 test.run       yes
 pre-test {
     test.args-append     LINKS="-L../LIB -litsol" \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/2acc8044/attachment.html>