[95601] trunk/dports/math/SuiteSparse/Portfile

[ryandesign at macports.org]

Revision: 95601
          https://trac.macports.org/changeset/95601
Author:   ryandesign at macports.org
Date:     2012-07-17 04:44:28 -0700 (Tue, 17 Jul 2012)
Log Message:
-----------
SuiteSparse:

 * simplify how arch flags are obtained by using [get_canonical_archflags]
 * merge post-configure block with configure block since the reason for doing things in the post-configure block no longer applies with recent versions of MacPorts
 * append to build deps in metis variant instead of overwriting them

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

Modified: trunk/dports/math/SuiteSparse/Portfile
===================================================================
--- trunk/dports/math/SuiteSparse/Portfile	2012-07-17 11:42:06 UTC (rev 95600)
+++ trunk/dports/math/SuiteSparse/Portfile	2012-07-17 11:44:28 UTC (rev 95601)
@@ -27,6 +27,8 @@
 global makefile
 set makefile ${worksrcpath}/SuiteSparse_config/SuiteSparse_config.mk
 
+variant universal {}
+
 post-patch {
     if {[variant_isset metis]} {
         # Use the MacPorts version rather than extracting copy in source dir
@@ -77,13 +79,9 @@
                 ${worksrcpath}/SuiteSparse_config/SuiteSparse_config_Linux.mk
     file rename ${worksrcpath}/SuiteSparse_config/SuiteSparse_config_Mac.mk \
                 ${worksrcpath}/SuiteSparse_config/SuiteSparse_config.mk
-}
 
-post-configure {
     # SuiteSparse does not use configure, so the variables must be
     #    set manually.
-    # This is done in post-configure so that ${configure.cc} is
-    #    set to its default value.
     reinplace "s|INSTALL_LIB = .*$|INSTALL_LIB = ${destroot}${prefix}/lib|g" ${makefile}
     reinplace "s|INSTALL_INCLUDE = .*$|INSTALL_INCLUDE = ${destroot}${prefix}/include|g" ${makefile}
 
@@ -110,21 +108,11 @@
 
 build.target        default
 build.args-append   CC="${configure.cc}" CXX="${configure.cxx}" \
-                    CFLAGS="${configure.cflags}" LDFLAGS="${configure.ldflags}"
+                    CFLAGS="${configure.cflags}" LDFLAGS="${configure.ldflags}" \
+                    TARGET_ARCH="[get_canonical_archflags]"
 
-if {[variant_isset universal]} {
-    build.args-append   TARGET_ARCH="${configure.universal_cflags}"
-} else {
-    build.args-append   TARGET_ARCH="${configure.cc_archflags}"
-}
-
 post-destroot {
     # Create a dylib from all .a static libs
-    if {[variant_isset universal]} {
-        set arch ${configure.universal_cflags}
-    } else {
-        set arch ${configure.cc_archflags}
-    }
 
     if {[variant_isset metis]} {
         catch {exec port installed metis} output
@@ -150,8 +138,8 @@
              libcholmod.a libcolamd.a libcxsparse.a libklu.a \
              libldl.a librbio.a libspqr.a libsuitesparseconfig.a libumfpack.a]
 
-    system "cd ${destroot}${prefix}/lib && \
-        ${configure.cxx} -Wall ${configure.cflags} ${arch} -dynamiclib -Wl,-all_load \
+    system -W ${destroot}${prefix}/lib "\
+        ${configure.cxx} -Wall ${configure.cflags} [get_canonical_archflags cxx] -dynamiclib -Wl,-all_load \
         -L${prefix}/lib ${atlas} ${metis} ${libs} -o lib${name}.${version}.dylib \
         -compatibility_version ${major} -current_version ${version} \
         -install_name ${prefix}/lib/lib${name}.${version}.dylib"
@@ -165,10 +153,8 @@
         ${destroot}${prefix}/share/doc/${name}
 }
 
-variant universal {}
-
 variant metis description {Use METIS for graph partitioning and sparse matrix ordering} {
-    depends_build       port:metis
+    depends_build-append port:metis
 }
 
 variant atlas description {Use MacPorts' ATLAS instead of Accelerate Framework} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120717/558e3351/attachment.html>