[81113] trunk/dports/graphics

[ryandesign at macports.org]

Revision: 81113
          http://trac.macports.org/changeset/81113
Author:   ryandesign at macports.org
Date:     2011-07-25 12:31:48 -0700 (Mon, 25 Jul 2011)
Log Message:
-----------
cairo, cairo-devel: no longer remove -flto since changes to muniversal portgroup apparently make this unnecessary; see #29842

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

Removed Paths:
-------------
    trunk/dports/graphics/cairo/files/configure_disable_lto.diff
    trunk/dports/graphics/cairo-devel/files/configure_disable_lto.diff

Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile	2011-07-25 19:09:48 UTC (rev 81112)
+++ trunk/dports/graphics/cairo/Portfile	2011-07-25 19:31:48 UTC (rev 81113)
@@ -51,12 +51,6 @@
 
 minimum_xcodeversions       {8 2.4.1}
 
-if {${configure.compiler} == "llvm-gcc-4.2" || ${configure.compiler} == "clang"} {
-    # -flto breaks static libs as .o files are llvm bitcode rather than Mach-O.
-    # The alternative would be to configure with --disable-static.
-    patchfiles-append configure_disable_lto.diff
-}
-
 pre-configure {
     set pixman_minimum_version 0.18.4
     set pixman_installed_version [exec ${prefix}/bin/pkg-config pixman-1 --modversion]

Deleted: trunk/dports/graphics/cairo/files/configure_disable_lto.diff
===================================================================
--- trunk/dports/graphics/cairo/files/configure_disable_lto.diff	2011-07-25 19:09:48 UTC (rev 81112)
+++ trunk/dports/graphics/cairo/files/configure_disable_lto.diff	2011-07-25 19:31:48 UTC (rev 81113)
@@ -1,11 +0,0 @@
---- configure.orig	2010-12-26 01:22:57.000000000 +1100
-+++ configure	2011-06-16 18:24:02.000000000 +1000
-@@ -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	2011-07-25 19:09:48 UTC (rev 81112)
+++ trunk/dports/graphics/cairo-devel/Portfile	2011-07-25 19:31:48 UTC (rev 81113)
@@ -51,12 +51,6 @@
 
 minimum_xcodeversions       {8 2.4.1}
 
-if {${configure.compiler} == "llvm-gcc-4.2" || ${configure.compiler} == "clang"} {
-    # -flto breaks static libs as .o files are llvm bitcode rather than Mach-O.
-    # The alternative would be to configure with --disable-static.
-    patchfiles-append configure_disable_lto.diff
-}
-
 pre-configure {
     set pixman_minimum_version 0.20.2
     set pixman_installed_version [exec ${prefix}/bin/pkg-config pixman-1 --modversion]

Deleted: trunk/dports/graphics/cairo-devel/files/configure_disable_lto.diff
===================================================================
--- trunk/dports/graphics/cairo-devel/files/configure_disable_lto.diff	2011-07-25 19:09:48 UTC (rev 81112)
+++ trunk/dports/graphics/cairo-devel/files/configure_disable_lto.diff	2011-07-25 19:31:48 UTC (rev 81113)
@@ -1,11 +0,0 @@
---- configure.orig	2010-12-26 01:22:57.000000000 +1100
-+++ configure	2011-06-16 18:24:02.000000000 +1000
-@@ -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/20110725/39494878/attachment.html>