Changeset 81084

Timestamp:

07/25/11 00:08:25 (4 years ago)

Author:

ryandesign@…

Message:

cairo-devel: merge r81083 from cairo: allegedly fix build on Lion with llvm-gcc-4.2 / clang (#29842) and +quartz (#30351)

Location:

trunk/dports/graphics/cairo-devel

Files:

• . (modified) (1 prop)
• Portfile (modified) (3 diffs)
• files (copied) (copied from trunk/dports/graphics/cairo/files)
• files/configure_disable_lto.diff (copied) (copied from trunk/dports/graphics/cairo/files/configure_disable_lto.diff)
• files/lion_fonts.diff (copied) (copied from trunk/dports/graphics/cairo/files/lion_fonts.diff)

trunk/dports/graphics/cairo-devel/Portfile

@@ -11 +11 @@
 set my_name                 cairo
 version                     1.11.2
-revision                    1
+revision                    2
 categories                  graphics
 maintainers                 ryandesign
@@ -51 +51 @@
 
 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 {
@@ -99 +105 @@
 }
 
+platform darwin 11 {
+    patchfiles-append       lion_fonts.diff
+}
+
 variant no_x11 conflicts opengl x11_xcb x11 description {Legacy compatibility variant} {}
 variant x11 conflicts no_x11 description {Enable X11 support} {