[84835] trunk/dports/graphics

[ryandesign at macports.org]

Revision: 84835
          http://trac.macports.org/changeset/84835
Author:   ryandesign at macports.org
Date:     2011-10-02 16:16:24 -0700 (Sun, 02 Oct 2011)
Log Message:
-----------
cairo, cairo-devel: give up on clang and llvm-gcc-4.2; see #31469

Modified Paths:
--------------
    trunk/dports/graphics/cairo/Portfile
    trunk/dports/graphics/cairo-devel/Portfile

Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile	2011-10-02 23:04:44 UTC (rev 84834)
+++ trunk/dports/graphics/cairo/Portfile	2011-10-02 23:16:24 UTC (rev 84835)
@@ -95,12 +95,12 @@
 }
 }
 
-if {${configure.compiler} == "clang"} {
-    configure.compiler      llvm-gcc-4.2
-}
-if {${configure.compiler} == "llvm-gcc-4.2"} {
-    if {[rpm-vercomp $xcodeversion 4.1] < 0} {
-        configure.compiler  gcc-4.2
+if {${configure.compiler} == "clang" ||
+    ${configure.compiler} == "llvm-gcc-4.2"} {
+    configure.compiler gcc-4.2
+    if {![file executable ${configure.cc}]} {
+        depends_build-append port:apple-gcc42
+        configure.compiler apple-gcc-4.2
     }
 }
 

Modified: trunk/dports/graphics/cairo-devel/Portfile
===================================================================
--- trunk/dports/graphics/cairo-devel/Portfile	2011-10-02 23:04:44 UTC (rev 84834)
+++ trunk/dports/graphics/cairo-devel/Portfile	2011-10-02 23:16:24 UTC (rev 84835)
@@ -95,12 +95,12 @@
 }
 }
 
-if {${configure.compiler} == "clang"} {
-    configure.compiler      llvm-gcc-4.2
-}
-if {${configure.compiler} == "llvm-gcc-4.2"} {
-    if {[rpm-vercomp $xcodeversion 4.1] < 0} {
-        configure.compiler  gcc-4.2
+if {${configure.compiler} == "clang" ||
+    ${configure.compiler} == "llvm-gcc-4.2"} {
+    configure.compiler gcc-4.2
+    if {![file executable ${configure.cc}]} {
+        depends_build-append port:apple-gcc42
+        configure.compiler apple-gcc-4.2
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111002/36b41c1b/attachment.html>