[61745] trunk/dports/_resources/port1.0/group/cmake-1.0.tcl

[jmr at macports.org]

Revision: 61745
          http://trac.macports.org/changeset/61745
Author:   jmr at macports.org
Date:     2009-12-20 15:47:28 -0800 (Sun, 20 Dec 2009)
Log Message:
-----------
cmake portgroup: don't declare a universal variant so universal can be disabled (#22957), respect configure.build_arch

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/cmake-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/cmake-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/cmake-1.0.tcl	2009-12-20 22:54:23 UTC (rev 61744)
+++ trunk/dports/_resources/port1.0/group/cmake-1.0.tcl	2009-12-20 23:47:28 UTC (rev 61745)
@@ -49,15 +49,18 @@
                     -DCMAKE_SYSTEM_PREFIX_PATH=\"${prefix}\;/usr\" \
                     -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake \
                     -Wno-dev
-
-variant universal {
-    if {${os.arch} == "powerpc" && ${os.major} == "8"} {
-        configure.args-append -DCMAKE_OSX_SYSROOT="${developer_dir}/SDKs/MacOSX10.4u.sdk"
+pre-configure {
+    if {${os.platform} == "darwin" && ![variant_isset universal]} {
+        configure.args-append \
+            -DCMAKE_OSX_ARCHITECTURES=\"${configure.build_arch}\"
     }
-    configure.universal_args-delete --disable-dependency-tracking
-    configure.args-append \
+    configure.universal_args-append \
         -DCMAKE_OSX_ARCHITECTURES=\"[strsed ${configure.universal_archs} "g| |;|"]\"
 }
+configure.universal_args-delete --disable-dependency-tracking
+if {${os.arch} == "powerpc" && ${os.major} == "8"} {
+    configure.universal_args-append -DCMAKE_OSX_SYSROOT="${developer_dir}/SDKs/MacOSX10.4u.sdk"
+}
 
 variant debug description "Enable debug binaries" {
     configure.args-delete   -DCMAKE_BUILD_TYPE=Release
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091220/461671e9/attachment.html>