[144149] trunk/dports/math

[mcalhoun at macports.org]

Revision: 144149
          https://trac.macports.org/changeset/144149
Author:   mcalhoun at macports.org
Date:     2016-01-02 23:17:55 -0800 (Sat, 02 Jan 2016)
Log Message:
-----------
arpack, qrupdate, SuiteSparse: use vecLibFort instead of Accelerate Framework
* Octave can crash unless it uses vecLibFort and its dependents do not use Accelerate Framework (run test suite to confirm)

Modified Paths:
--------------
    trunk/dports/math/SuiteSparse/Portfile
    trunk/dports/math/arpack/Portfile
    trunk/dports/math/qrupdate/Portfile

Modified: trunk/dports/math/SuiteSparse/Portfile
===================================================================
--- trunk/dports/math/SuiteSparse/Portfile	2016-01-03 07:07:07 UTC (rev 144148)
+++ trunk/dports/math/SuiteSparse/Portfile	2016-01-03 07:17:55 UTC (rev 144149)
@@ -7,7 +7,7 @@
 name                SuiteSparse
 epoch               20120107
 version             4.2.1
-revision            3
+revision            4
 categories          math science
 platforms           darwin
 maintainers         michaelld openmaintainer
@@ -73,7 +73,7 @@
 
     # select BLAS and LAPACK
 
-    set BLAS "-framework Accelerate"
+    set BLAS "${prefix}/lib/vecLibFort.dylib"
     if {[variant_isset atlas]} {
         # Threaded lib gets priority over non-threaded (ppc)
         if {[file exists ${prefix}/lib/libtatlas.dylib]} {
@@ -128,7 +128,7 @@
         }
     }
 
-    set atlas "-framework Accelerate"
+    set atlas "-lvecLibFort"
     if {[variant_isset atlas]} {
         if {[file exists ${prefix}/lib/libtatlas.dylib]} {
             set atlas "-ltatlas"

Modified: trunk/dports/math/arpack/Portfile
===================================================================
--- trunk/dports/math/arpack/Portfile	2016-01-03 07:07:07 UTC (rev 144148)
+++ trunk/dports/math/arpack/Portfile	2016-01-03 07:17:55 UTC (rev 144149)
@@ -9,7 +9,7 @@
 
 github.setup        opencollab arpack-ng 3.3.0
 name                arpack
-revision            1
+revision            2
 categories          math
 license             BSD
 platforms           darwin
@@ -62,11 +62,7 @@
 }
 
 variant accelerate conflicts atlas openblas description {build with Accelerate framework} {
-    # the change of LDFLAGS is required to avoid linking against the ATLAS ones
-    # if they are present; if we specify /usr/lib/libblas.dylib directly, the
-    # linking fails. http://forge.scilab.org/index.php/p/arpack-ng/issues/1220/
-    configure.args-delete  LDFLAGS=''
-    configure.args-append  LDFLAGS='/usr/lib/libblas.dylib /usr/lib/liblapack.dylib' --with-blas="-lblas -llapack"
+    configure.args-append --with-blas="-L${prefix}/lib -lvecLibFort"
 }
 
 variant atlas conflicts accelerate openblas description {build with atlas} {

Modified: trunk/dports/math/qrupdate/Portfile
===================================================================
--- trunk/dports/math/qrupdate/Portfile	2016-01-03 07:07:07 UTC (rev 144148)
+++ trunk/dports/math/qrupdate/Portfile	2016-01-03 07:17:55 UTC (rev 144149)
@@ -10,7 +10,7 @@
 
 name                qrupdate
 version             1.1.2
-revision            3
+revision            4
 # upstream follows a weird folder naming policy, we need last two digits of version separated by a dot
 set branch          [join [lrange [split ${version} .] 1 2] .]
 categories          math
@@ -76,9 +76,9 @@
 
 variant accelerate conflicts atlas openblas description {build with Accelerate framework} {
     depends_lib-append      port:vecLibFort
-    build.args-append       BLAS=-lvecLibFort LAPACK="-framework Accelerate"
-    destroot.args-append    BLAS=-lvecLibFort LAPACK="-framework Accelerate"
-    test.args-append        BLAS=-lvecLibFort LAPACK="-framework Accelerate"
+    build.args-append       BLAS=-lvecLibFort LAPACK=-lvecLibFort
+    destroot.args-append    BLAS=-lvecLibFort LAPACK=-lvecLibFort
+    test.args-append        BLAS=-lvecLibFort LAPACK=-lvecLibFort
 }
 
 variant openblas conflicts accelerate atlas description {build with Accelerate framework} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160102/026523e5/attachment.html>