Changeset 98544

Timestamp:

Oct 8, 2012, 1:25:11 PM (12 years ago)

Author:

vince@…

Message:

1. Correct a bug of the previous patch that did not handle correctly universal builds;
2. Bump to LAPACK 3.4.2 (wherefore the _1 revision).

File:

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

trunk/dports/math/atlas/Portfile

@@ -8 +8 @@
 name                            atlas
 version                         3.10.0
+revision                                                1
 
 # additional versions
-set lapackversion               3.4.1
+set lapackversion               3.4.2
 set lapackname                  lapack
 set atlasdist                   ${name}${version}.tar.bz2
@@ -37 +38 @@
 rmd160  4e969dfee2662c536e2f2bfc49b51e8ef5bc2c94 \
 sha256  a90a2e3463504e3297b56edc13769d766732e82bd8f1de951cfc78444f148465 \
-                    lapack-3.4.1.tgz \
-rmd160  3b715aff2924b47a45433376cfb9b66ffeeeb46d \
-sha256  93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f
+                    lapack-3.4.2.tgz \
+rmd160  8740c35c9a85b71424fe1ffeed192256aebeb431 \
+sha256  60a65daaf16ec315034675942618a2230521ea7adf85eea788ee54841072faf0
 
 
@@ -431 +432 @@
 
     if {[variant_isset universal]} {
-        set    archs ${universal_archs_to_use}
-    } else {
-        set    archs ${build_arch}
-    }
-
-    foreach arch ${archs} {
-        if {![variant_isset universal]} {
-            set    atlas_path ${workpath}/${name}-${version}
-        } else {
-            set    atlas_path ${workpath}/${name}-${version}-${arch}
-        }
-
-        file mkdir ${atlas_path}/build
+        foreach arch ${universal_archs_to_use} {
+                        file mkdir ${workpath}/${name}-${version}-${arch}/build
+                }
+    } else {
+        file mkdir ${workpath}/${name}-${version}/build
     }
 }
@@ -483 +476 @@
 
 post-build {
-    reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
-        ${build.dir}/lib/Makefile
-    reinplace "s|dynamic|dynamiclib|g" \
-        ${build.dir}/lib/Makefile
-    system "cd ${build.dir}/lib && ${build.cmd} shared_all"
+        if {! [variant_isset universal]} {
+                reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
+                        ${build.dir}/lib/Makefile
+                reinplace "s|dynamic|dynamiclib|g" \
+                        ${build.dir}/lib/Makefile
+                system "cd ${build.dir}/lib && ${build.cmd} shared_all"
+        } else {
+        foreach arch ${universal_archs_to_use} {
+                        reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
+                                ${workpath}/${name}-${version}-${arch}/build/lib/Makefile
+                        reinplace "s|dynamic|dynamiclib|g" \
+                                ${workpath}/${name}-${version}-${arch}/build/lib/Makefile
+                        system "cd ${workpath}/${name}-${version}-${arch}/build/lib && \
+                                        ${build.cmd} shared_all"
+                }
+        }
 }