Changeset 98048

Timestamp:

Sep 24, 2012, 5:07:37 AM (12 years ago)

Author:

jeremyhu@…

Message:

qt4-mac*: Build with clang

Location:

trunk/dports/aqua

Files:

• qt4-mac-devel/Portfile (modified) (3 diffs)
• qt4-mac/Portfile (modified) (3 diffs)

trunk/dports/aqua/qt4-mac-devel/Portfile

@@ -168 +168 @@
 # 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
 }
 
@@ -250 +251 @@
     -fast                                                 \
     -optimized-qmake                                      \
+    -no-pch                                               \
     -no-framework                                         \
     -no-phonon                                            \
@@ -291 +293 @@
         # 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

trunk/dports/aqua/qt4-mac/Portfile

@@ -335 +335 @@
 # 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
 }
 
@@ -421 +422 @@
     -fast                                                 \
     -optimized-qmake                                      \
+    -no-pch                                               \
     -framework                                            \
     -no-phonon                                            \
@@ -471 +473 @@
 
     #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