[89314] trunk/dports/graphics

[ryandesign at macports.org]

Revision: 89314
          http://trac.macports.org/changeset/89314
Author:   ryandesign at macports.org
Date:     2012-01-24 10:59:33 -0800 (Tue, 24 Jan 2012)
Log Message:
-----------
cairo, cairo-devel: allow clang again on the hope that it will now work, and allow llvm-gcc-4.2 with a small patch; see #32087

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

Added Paths:
-----------
    trunk/dports/graphics/cairo/files/patch-llvm-gcc-lto.diff
    trunk/dports/graphics/cairo-devel/files/patch-llvm-gcc-lto.diff

Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile	2012-01-24 18:09:20 UTC (rev 89313)
+++ trunk/dports/graphics/cairo/Portfile	2012-01-24 18:59:33 UTC (rev 89314)
@@ -95,13 +95,8 @@
 }
 }
 
-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
-    }
+if {${configure.compiler} == "llvm-gcc-4.2"} {
+    patchfiles-append       patch-llvm-gcc-lto.diff
 }
 
 platform darwin 9 {

Added: trunk/dports/graphics/cairo/files/patch-llvm-gcc-lto.diff
===================================================================
--- trunk/dports/graphics/cairo/files/patch-llvm-gcc-lto.diff	                        (rev 0)
+++ trunk/dports/graphics/cairo/files/patch-llvm-gcc-lto.diff	2012-01-24 18:59:33 UTC (rev 89314)
@@ -0,0 +1,11 @@
+--- configure.orig	2012-01-09 03:44:48.000000000 +0100
++++ configure	2012-01-09 03:45:01.000000000 +0100
+@@ -17236,7 +17236,7 @@
+ MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \
+ 			-erroff=E_ENUM_TYPE_MISMATCH_OP"
+ 
+-MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto"
++MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
+ 
+ MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
+ 

Modified: trunk/dports/graphics/cairo-devel/Portfile
===================================================================
--- trunk/dports/graphics/cairo-devel/Portfile	2012-01-24 18:09:20 UTC (rev 89313)
+++ trunk/dports/graphics/cairo-devel/Portfile	2012-01-24 18:59:33 UTC (rev 89314)
@@ -95,13 +95,8 @@
 }
 }
 
-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
-    }
+if {${configure.compiler} == "llvm-gcc-4.2"} {
+    patchfiles-append       patch-llvm-gcc-lto.diff
 }
 
 platform darwin 9 {

Added: trunk/dports/graphics/cairo-devel/files/patch-llvm-gcc-lto.diff
===================================================================
--- trunk/dports/graphics/cairo-devel/files/patch-llvm-gcc-lto.diff	                        (rev 0)
+++ trunk/dports/graphics/cairo-devel/files/patch-llvm-gcc-lto.diff	2012-01-24 18:59:33 UTC (rev 89314)
@@ -0,0 +1,11 @@
+--- configure.orig	2012-01-09 03:44:48.000000000 +0100
++++ configure	2012-01-09 03:45:01.000000000 +0100
+@@ -17236,7 +17236,7 @@
+ MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \
+ 			-erroff=E_ENUM_TYPE_MISMATCH_OP"
+ 
+-MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto"
++MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
+ 
+ MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120124/1136d22d/attachment.html>