[93305] trunk/dports/math/atlas/Portfile

[vince at macports.org]

Revision: 93305
          https://trac.macports.org/changeset/93305
Author:   vince at macports.org
Date:     2012-05-19 06:38:58 -0700 (Sat, 19 May 2012)
Log Message:
-----------
Bump to 3.9.75 (released yesturday) and reverts to gcc46 as default on both
OS X 10.6 and 10.7+ (since clang build takes a long time and gives worse
timings than GCC).

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

Modified: trunk/dports/math/atlas/Portfile
===================================================================
--- trunk/dports/math/atlas/Portfile	2012-05-19 13:36:20 UTC (rev 93304)
+++ trunk/dports/math/atlas/Portfile	2012-05-19 13:38:58 UTC (rev 93305)
@@ -6,7 +6,7 @@
 categories                      math
 license                         BSD
 name                            atlas
-version                         3.9.74
+version                         3.9.75
 
 set ports_ignore_older          yes
 
@@ -38,10 +38,10 @@
 
 
 
-checksums                       atlas3.9.74.tar.bz2 \
-    rmd160  6f1fbc259b55f87cde8d616f62df21a77c621126 \
-    sha256  2b3e9c7c6d9d8ee0119898f97a86ffa6c7841d0c00b4e3129b5536ac06b570cb \
-                                lapack-3.4.0.tgz \
+checksums                       atlas3.9.75.tar.bz2 \
+    rmd160  8b58bf86f7a8004889a476759c34f9466f8bd178 \
+    sha256  fb25dcd78fe9ec81f14a9a3bfcab2b12c9445581a62c04eb295caacff199c57b \
+    lapack-3.4.0.tgz \
     rmd160  42599fbc1e9f943454d243097b043daa51668d4e \
     sha256  a7139ef97004d0e3c4c30f1c52d508fd7ae84b5fbaf0dd8e792c167dc306c3e9
 
@@ -125,11 +125,15 @@
     } elseif {[variant_isset mpclang]} {
     
         configure.compiler      macports-clang
+    } elseif {[variant_isset clang]} {
+    
+        configure.compiler      clang
+
     } else {
         
-        # Defaults to clang
-        configure.compiler      clang
-        default_variants        +clang
+        # Defaults to gcc46
+        set                     gccversion 4.6
+        default_variants        +gcc46
     }
 }
 
@@ -414,6 +418,8 @@
         set         archs ${build_arch}
     }
 
+    set libgfbasepath   ${prefix}/lib/gcc${gccnumber}
+    
     foreach arch ${archs} {
         if {![variant_isset universal]} {
         
@@ -428,10 +434,21 @@
         reinplace    "s|rm -f|rm -rf|g" ${atlas_path}/build/Makefile
         
         # Workaround a bug in dylib generation
+
         if {[info exists gccnumber]} {
-            reinplace \
-            "s|F77SYSLIB.*|F77SYSLIB = ${prefix}/lib/gcc${gccnumber}/libgfortran.dylib|" \
-            ${atlas_path}/build/Make.inc
+
+            set libgfarchpath   ${libgfbasepath}/${arch}            
+            if {[file exists ${libgfarchpath}/libgfortran.dylib]} {
+                
+                reinplace \
+                    "s|F77SYSLIB.*|F77SYSLIB = ${libgfarchpath}/libgfortran.dylib|" \
+                    ${atlas_path}/build/Make.inc
+            } else {
+                
+                reinplace \
+                    "s|F77SYSLIB.*|F77SYSLIB = ${libgfbasepath}/libgfortran.dylib|" \
+                    ${atlas_path}/build/Make.inc
+            }                
         }
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120519/a610922a/attachment.html>