Changeset 81037

Timestamp:

07/23/11 20:53:31 (4 years ago)

Author:

takeshi@…

Message:

octave: removed Carbon. enabled acelerate with 64-bit

File:

• trunk/dports/math/octave/Portfile (modified) (4 diffs)

trunk/dports/math/octave/Portfile

@@ -6 +6 @@
 name                octave
 version             3.2.4
-revision            4
+revision            5
 conflicts           octave-devel
 categories          math science
@@ -63 +63 @@
                     --with-ccolamd \
                     --with-cholmod \
-                    --with-cxsparse
+                    --with-cxsparse \
+                    --without-framework-carbon
 
 configure.perl      ${prefix}/bin/perl
@@ -84 +85 @@
 }
 variant accelerate conflicts atlas description {use BLAS from Accelerate.framework} {
-    configure.fflags-append -ff2c
     if {![variant_isset g95]} {
-        configure.args-append   --with-blas="-framework Accelerate"
+        configure.fflags-append -ff2c
+    }
+    if {[variant_isset g95] || ([string match *64* $build_arch] && ${os.major} >= 10)} {
+        depends_lib-append      port:dotwrp
+        configure.args-append   --with-blas="-ldotwrp -framework Accelerate"
     }
     configure.args-append   --with-lapack="-framework Accelerate"
-    
-    if {[string match *64* $build_arch] && ${os.major} == 10} {
-        # see http://www.macresearch.org/lapackblas-fortran-106#comment-17217
-        pre-fetch {
-            return -code error "Accelerate.framework cannot be used by 64-bit FORTRAN code on Snow Leopard."
-        }
-    }
 }
 if {[variant_isset g95]} {
@@ -125 +122 @@
 variant g95 description {build with g95} requires accelerate conflicts atlas gcc43 gcc44 gcc45 {
     depends_build-append    port:g95
-    depends_lib-append  port:dotwrp
     configure.f77       "${prefix}/bin/g95"
-    configure.args-append   --with-blas="-ldotwrp -framework Accelerate"
 }