[42801] trunk/dports/multimedia/x264/Portfile

[jmr at macports.org]

Revision: 42801
          http://trac.macports.org/changeset/42801
Author:   jmr at macports.org
Date:     2008-11-30 18:26:35 -0800 (Sun, 30 Nov 2008)
Log Message:
-----------
x264: further to r42793, use universal_archs if present

Modified Paths:
--------------
    trunk/dports/multimedia/x264/Portfile

Modified: trunk/dports/multimedia/x264/Portfile
===================================================================
--- trunk/dports/multimedia/x264/Portfile	2008-12-01 02:12:25 UTC (rev 42800)
+++ trunk/dports/multimedia/x264/Portfile	2008-12-01 02:26:35 UTC (rev 42801)
@@ -40,19 +40,21 @@
 	configure.cflags-append "-mcpu=970 -mtune=970 -mpowerpc64 -mpowerpc-gpopt -fast -mabi=altivec -maltivec"
 }
 
-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 {
@@ -61,7 +63,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} -I${prefix}/include -L${prefix}/lib"
       set my_ldflags "${configure.ldflags} ${my_arch_flag}"
@@ -75,7 +77,7 @@
   }
 
   build {
-    foreach arch ${my_universal_archs} {
+    foreach arch ${universal_archs} {
       system "cd ${workpath}/${arch} && ${build.cmd} ${build.pre_args}"
       # This was a first look at dylib. Needs some more investigation as I don't know ins&outs of macports
       #system "cd ${workpath}/${arch} && gcc -dynamiclib -arch ${arch} -o ${workpath}/${arch}/libx264.dylib common/*.o common/${arch}/*.o encoder/*.o"
@@ -88,7 +90,7 @@
     #foreach lib [list [file readlink ${workpath}/${first_arch}/libx264.dylib] libx264.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}/${lib}
     #  }
     #  lappend lipo_args -create -output ${output_lib}
@@ -98,7 +100,7 @@
     # Do currently only .a
     set output_lib ${destroot}${prefix}/lib/libx264.a
     set lipo_args {}
-    foreach arch ${my_universal_archs} {
+    foreach arch ${universal_archs} {
       lappend lipo_args -arch ${arch} ${workpath}/${arch}/libx264.a
     }
     lappend lipo_args -create -output ${output_lib}
@@ -107,7 +109,7 @@
  
     set output_bin ${destroot}${prefix}/bin/x264
     set lipo_args {}
-    foreach arch ${my_universal_archs} {
+    foreach arch ${universal_archs} {
       lappend lipo_args -arch ${arch} ${workpath}/${arch}/x264
     }
     lappend lipo_args -create -output ${output_bin}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081130/0b1847e6/attachment.html>