[98048] trunk/dports/aqua

[jeremyhu at macports.org]

Revision: 98048
          http://trac.macports.org//changeset/98048
Author:   jeremyhu at macports.org
Date:     2012-09-23 22:07:37 -0700 (Sun, 23 Sep 2012)
Log Message:
-----------
qt4-mac*: Build with clang

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

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2012-09-24 04:00:16 UTC (rev 98047)
+++ trunk/dports/aqua/qt4-mac/Portfile	2012-09-24 05:07:37 UTC (rev 98048)
@@ -334,9 +334,10 @@
 # The build process uses -fconstant-cfstrings.
 # configure.compiler should therefore not be one of the MacPorts compilers.
 
-# does not work with clang, see #30271 and #31638 .
-if {${configure.compiler} == "clang"} {
-    configure.compiler llvm-gcc-4.2
+# http://llvm.org/bugs/show_bug.cgi?id=8971, #30271, #31076, #31638
+compiler.blacklist {macports-clang-2.9}
+if {[vercmp $xcodeversion 4.3] < 0} {
+    compiler.blacklist-append clang
 }
 
 # --prefix is not recognized.
@@ -420,6 +421,7 @@
     -dbus-linked                                          \
     -fast                                                 \
     -optimized-qmake                                      \
+    -no-pch                                               \
     -framework                                            \
     -no-phonon                                            \
     -no-phonon-backend
@@ -471,12 +473,6 @@
 
     #if {[llength ${qt_arch_types}] != 1 || [variant_isset x11]}
 
-    if {[llength ${qt_arch_types}] != 1} {
-        configure.args-append -no-pch
-    } else {
-        configure.args-append -pch
-    }
-
     # check to see if not compiling for the native machine hardware
     # (e.g., compiling for just i386 but CPU is x86_64); optimization
     # of QMake does not work in this circumstance.

Modified: trunk/dports/aqua/qt4-mac-devel/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/Portfile	2012-09-24 04:00:16 UTC (rev 98047)
+++ trunk/dports/aqua/qt4-mac-devel/Portfile	2012-09-24 05:07:37 UTC (rev 98048)
@@ -167,9 +167,10 @@
 # The build process uses -fconstant-cfstrings.
 # configure.compiler should therefore not be one of the MacPorts compilers.
 
-# does not work with clang, see #31076 .
-if {${configure.compiler} == "clang"} {
-    configure.compiler llvm-gcc-4.2
+# http://llvm.org/bugs/show_bug.cgi?id=8971, #30271, #31076, #31638
+compiler.blacklist {macports-clang-2.9}
+if {[vercmp $xcodeversion 4.3] < 0} {
+    compiler.blacklist-append clang
 }
 
 # --prefix is not recognized.
@@ -249,6 +250,7 @@
     -dbus-linked                                          \
     -fast                                                 \
     -optimized-qmake                                      \
+    -no-pch                                               \
     -no-framework                                         \
     -no-phonon                                            \
     -no-phonon-backend
@@ -291,15 +293,6 @@
         # retrieve the arch type(s) to use, in Qt-speak
         configure.args-append -arch \"${qt_arch_types}\"
 
-        # cannot use pre-compiled headers when compiling with more than 1
-        # arch type (typically +universal) or for X11
-        #if {[llength ${qt_arch_types}] != 1 || [variant_isset x11]}
-        if {[llength ${qt_arch_types}] != 1} {
-            configure.args-append -no-pch
-        } else {
-            configure.args-append -pch
-        }
-
         # check to see if not compiling for the native machine hardware
         # (e.g., compiling for just i386 but CPU is x86_64); optimization
         # of QMake does not work in this circumstance.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120923/ade90976/attachment.html>