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

[jeremyhu at macports.org]

Revision: 47357
          http://trac.macports.org/changeset/47357
Author:   jeremyhu at macports.org
Date:     2009-02-26 13:47:59 -0800 (Thu, 26 Feb 2009)
Log Message:
-----------
x264: Make universal more robust, support G5 variant in universal

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

Modified: trunk/dports/multimedia/x264/Portfile
===================================================================
--- trunk/dports/multimedia/x264/Portfile	2009-02-26 21:03:52 UTC (rev 47356)
+++ trunk/dports/multimedia/x264/Portfile	2009-02-26 21:47:59 UTC (rev 47357)
@@ -36,7 +36,9 @@
 }
 
 variant G5 description {G5 specific optimizations} {
-	configure.cflags-append "-mcpu=970 -mtune=970 -mpowerpc64 -mpowerpc-gpopt -fast -mabi=altivec -maltivec"
+	if {! [variant_isset universal]} {
+		configure.cflags-append "-mcpu=970 -mtune=970 -mpowerpc64 -mpowerpc-gpopt -fast -mabi=altivec -maltivec"
+	}
 }
 
 if {![info exists universal_archs]} {
@@ -66,10 +68,13 @@
       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}"
-      if {[string equal ${arch} i386 ]} {
-         set my_configure_args "CC=\"gcc -arch ${arch}\"" 
-      } else { 
-         set my_configure_args "CC=\"gcc -arch ${arch}\" --disable-asm"
+      set my_configure_args "--host=${arch}-apple-darwin"
+      if {[string equal ${arch} ppc ] || [string equal ${arch} ppc64 ]} {
+         set my_configure_args "${my_configure_args} --disable-asm"
+
+         if {[variant_isset G5] || [string equal ${arch} ppc64 ]} {
+             set my_cflags "${my_cflags} -mcpu=970 -mtune=970 -mpowerpc64 -mpowerpc-gpopt -fast -mabi=altivec -maltivec"
+         }
       }
       system "cd ${workpath}/${arch} && CFLAGS=\"${my_cflags}\" CXXFLAGS=\"${my_cflags}\" LDFLAGS=\"${my_ldflags}\" ${configure.cmd} ${configure.pre_args} ${configure.args} ${my_configure_args}"
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090226/e2e39b8a/attachment-0001.html>