[38946] trunk/dports/graphics/cairo/Portfile

[ryandesign at macports.org]

Revision: 38946
          http://trac.macosforge.org/projects/macports/changeset/38946
Author:   ryandesign at macports.org
Date:     2008-08-03 03:42:50 -0700 (Sun, 03 Aug 2008)
Log Message:
-----------
cairo: use ${universal_archs}; don't assume "i386 ppc"; see #16007

Modified Paths:
--------------
    trunk/dports/graphics/cairo/Portfile

Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile	2008-08-03 10:29:47 UTC (rev 38945)
+++ trunk/dports/graphics/cairo/Portfile	2008-08-03 10:42:50 UTC (rev 38946)
@@ -111,19 +111,21 @@
     }
 }
 
-set my_universal_archs {i386 ppc}
-set first_arch [lindex ${my_universal_archs} 0]
+if {![info exists universal_archs]} {
+    set universal_archs {i386 ppc}
+}
+set first_arch [lindex ${universal_archs} 0]
 
 set my_worksrcpaths ${worksrcpath}
 
 variant universal {
     set my_worksrcpaths {}
-    foreach arch ${my_universal_archs} {
+    foreach arch ${universal_archs} {
         lappend my_worksrcpaths ${workpath}/${arch}
     }
 
     post-patch {
-        foreach arch ${my_universal_archs} {
+        foreach arch ${universal_archs} {
             if {[string equal ${arch} ${first_arch}]} {
                 move ${worksrcpath} ${workpath}/${first_arch}
             } else {
@@ -133,7 +135,7 @@
     }
     
     configure {
-        foreach arch ${my_universal_archs} {
+        foreach arch ${universal_archs} {
             set my_arch_flag "-arch ${arch}"
             set my_cflags "${configure.cflags} -isysroot ${sysroot} ${my_arch_flag}"
             set my_ldflags "${configure.ldflags} ${my_arch_flag}"
@@ -142,7 +144,7 @@
     }
     
     build {
-        foreach arch ${my_universal_archs} {
+        foreach arch ${universal_archs} {
             system "cd ${workpath}/${arch} && ${build.cmd} ${build.pre_args}"
         }
     }
@@ -152,7 +154,7 @@
         foreach lib [list [file readlink ${workpath}/${first_arch}/src/.libs/libcairo.dylib] libcairo.a] {
             set output_lib ${destroot}${prefix}/lib/${lib}
             set lipo_args {}
-            foreach arch ${my_universal_archs} {
+            foreach arch ${universal_archs} {
                 lappend lipo_args -arch ${arch} ${workpath}/${arch}/src/.libs/${lib}
             }
             lappend lipo_args -create -output ${output_lib}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080803/1256a12f/attachment.html