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

[jmr at macports.org]

Revision: 57668
          http://trac.macports.org/changeset/57668
Author:   jmr at macports.org
Date:     2009-09-14 11:46:01 -0700 (Mon, 14 Sep 2009)
Log Message:
-----------
x264: try to respect build_arch everywhere, use xcodeversion portgroup

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

Modified: trunk/dports/multimedia/x264/Portfile
===================================================================
--- trunk/dports/multimedia/x264/Portfile	2009-09-14 18:43:58 UTC (rev 57667)
+++ trunk/dports/multimedia/x264/Portfile	2009-09-14 18:46:01 UTC (rev 57668)
@@ -3,6 +3,7 @@
 
 PortSystem 1.0
 PortGroup               muniversal 1.0
+PortGroup               xcodeversion 1.0
 
 name		x264
 version		20090810
@@ -26,18 +27,8 @@
 
 use_bzip2	yes
 
-pre-extract {
-    if {"darwin" == ${os.platform} && 9 == ${os.major}} {
-        set minimum_xcodeversion 3.1
-        set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
-        if {[rpm-vercomp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
-            ui_error "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} or later but you have Xcode ${current_xcodeversion}."
-            return -code error "incompatible Xcode version"
-        }
-    }
-}
+minimum_xcodeversions {9 3.1}
 
-
 configure.args   --enable-pthread \
                  --enable-pic \
                  --enable-shared \
@@ -45,15 +36,15 @@
 
 # asm works with a 64-bit snow leopard build
 
-if {"darwin" == ${os.platform} && 10 == ${os.major} && "x86_64" == $build_arch && ![variant_isset universal]} {
+if {[variant_isset asm] || ("darwin" == ${os.platform} && 10 == ${os.major} && "x86_64" == $build_arch && ![variant_isset universal])} {
         depends_build-append    port:yasm
         configure.args-delete   --disable-asm
-        configure.args-append   --build=x86_64-apple-darwin10
-} elseif { [variant_isset asm] } {
-        depends_build-append    port:yasm
-        configure.args-delete   --disable-asm
 }
+if {${os.platform} == "darwin" && $build_arch != ""} {
+    configure.args-append   --build=${build_arch}-apple-darwin${os.major}
+}
 
+
 configure.cflags-append -I. -fno-common -read_only_relocs suppress
 
 destroot.args	DIR_INSTALL=${destroot}${prefix}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090914/c7569fd6/attachment.html>