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

michaelld at macports.org michaelld at macports.org
Wed Jan 9 17:38:42 PST 2013


Revision: 101393
          https://trac.macports.org/changeset/101393
Author:   michaelld at macports.org
Date:     2013-01-09 17:38:42 -0800 (Wed, 09 Jan 2013)
Log Message:
-----------
qt4-mac :
* Block Apple clang on 10.7 or older;
* Comment out quartz variant since it does nothing.

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

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2013-01-10 00:23:08 UTC (rev 101392)
+++ trunk/dports/aqua/qt4-mac/Portfile	2013-01-10 01:38:42 UTC (rev 101393)
@@ -339,14 +339,14 @@
 # configure.compiler should therefore not be one of the MacPorts compilers.
 
 # Qt4 does not compile with clang 3.0 or older; it also does not work
-# with Apple's clang from XCode 4.4 or older.  Block the clang
-# versions, both from Apple and MacPorts, and that don't meet these
-# requirements.
+# with Apple's clang from XCode 4.4 or older, or as installed on Mac
+# OS X 10.7 or earlier.  Block the clang versions, both from Apple and
+# MacPorts, and that don't meet these requirements.
 #
 # http://llvm.org/bugs/show_bug.cgi?id=8971, # #30271, #31076, #31638
 
 compiler.blacklist { macports-clang-2.9 macports-clang-3.0 }
-if {[vercmp $xcodeversion 4.4] <= 0} {
+if {[vercmp $xcodeversion 4.4] <= 0 || $MINOR <= 7} {
     compiler.blacklist-append clang
 }
 
@@ -991,15 +991,15 @@
 }
 
 #variant quartz conflicts x11
-variant quartz \
-description {Build for Native OSX Quartz GUI, not X11 (default)} {}
+#variant quartz \
+#description {Build for Native OSX Quartz GUI, not X11 (default)} {}
 
 #variant x11 conflicts quartz \
 #description {Build for X11 GUI, not Native OSX Quartz} {}
 
 # if neither +x11 or +quartz were specified, default to the latter
 #if {![variant_isset quartz] && ![variant_isset x11]} {
-    default_variants +quartz
+#    default_variants +quartz
 #}
 
 # check to see if user specified just "-quartz", which can't work.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130109/179428de/attachment.html>


More information about the macports-changes mailing list