[86972] trunk/dports/aqua/qt4-mac/Portfile

[michaelld at macports.org]

Revision: 86972
          http://trac.macports.org/changeset/86972
Author:   michaelld at macports.org
Date:     2011-11-07 09:11:42 -0800 (Mon, 07 Nov 2011)
Log Message:
-----------
qt4-mac: Tweak qmake optimization to match the comment -- disable on OSX 10.6, 32-bit.

Modified Paths:
--------------
    trunk/dports/aqua/qt4-mac/Portfile

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2011-11-07 16:49:54 UTC (rev 86971)
+++ trunk/dports/aqua/qt4-mac/Portfile	2011-11-07 17:11:42 UTC (rev 86972)
@@ -318,6 +318,11 @@
         if {[lsearch -exact ${qt_arch_types} ${os.arch}] == -1} {
             # not building for native arch: disable optimizing qmake
             configure.args-delete -optimized-qmake
+        } elseif {${MINOR} == "6" &&
+                  [llength ${qt_arch_types}] == 1] &&
+                  [lsearch -exact ${qt_arch_types} x86] == 0} {
+            # disable qmake optimization on 10.6 32-bit
+            configure.args-delete -optimized-qmake
         }
 
         # find a way to specify the SDK to use; Qt will use the 10.4u
@@ -347,11 +352,6 @@
     }
 }
 
-platform darwin 10 i386 {
-    # optimization of QMake does not work on 10.6 32-bit native
-    configure.args-delete -optimized-qmake
-}
-
 # Remove any '-I' and '-L' string from the *FLAGS for SQLITE, DBUS,
 # ODBC, and OPENSSL, so that what remains are just non-I/L flags;
 # these paths are in compiler.cpath and compiler.library_path.  The
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111107/d2a0ca09/attachment.html>