[110511] trunk/dports/www/webkit-gtk/Portfile

[jeremyhu at macports.org]

Revision: 110511
          https://trac.macports.org/changeset/110511
Author:   jeremyhu at macports.org
Date:     2013-08-31 15:52:44 -0700 (Sat, 31 Aug 2013)
Log Message:
-----------
webkit-gtk: Build fix for Leopard and earlier (#38682)

Modified Paths:
--------------
    trunk/dports/www/webkit-gtk/Portfile

Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile	2013-08-31 22:18:40 UTC (rev 110510)
+++ trunk/dports/www/webkit-gtk/Portfile	2013-08-31 22:52:44 UTC (rev 110511)
@@ -118,6 +118,11 @@
 # https://bugs.webkit.org/show_bug.cgi?id=94488
 configure.universal_args-delete --disable-dependency-tracking
 
+# configure checks that we're clang 3.0, gcc 4.7, or better
+compiler.blacklist-append gcc-3.3 gcc-4.0 apple-gcc-4.0 gcc-4.2 apple-gcc-4.2 llvm-gcc-4.2 macports-llvm-gcc-4.2
+compiler.blacklist-append macports-gcc-4.2 macports-gcc-4.3 macports-gcc-4.4 macports-gcc-4.5 macports-gcc-4.6
+compiler.blacklist-append {clang < 300} macports-clang-2.9
+
 # gobject-introspection uses g-ir-scanner, which uses $CC from env
 if {[variant_isset universal]} {
     foreach arch ${configure.universal_archs} {
@@ -152,15 +157,6 @@
 use_autoreconf  yes
 autoreconf.args -fvi
 
-# configure checks that we're clang 3.0, gcc 4.7, or better
-compiler.blacklist-append gcc-3.3 gcc-4.0 apple-gcc-4.0 gcc-4.2 apple-gcc-4.2 llvm-gcc-4.2 macports-llvm-gcc-4.2
-compiler.blacklist-append macports-gcc-4.2 macports-gcc-4.3 macports-gcc-4.4 macports-gcc-4.5 macports-gcc-4.6
-compiler.blacklist-append {clang < 300} macports-clang-2.9
-
-if {[string match *clang* ${configure.compiler}]} {
-    configure.cxxflags-append -Wno-c++11-extensions
-}
-
 lappend merger_dont_diff ${prefix}/include/webkitgtk-1.0/webkitdom/WebKitDOMNavigator.h
 
 post-patch {
@@ -217,6 +213,9 @@
         depends_build-append      port:python27
         # https://trac.macports.org/ticket/35793
         configure.python          ${prefix}/bin/python2.7
+
+        # https://trac.macports.org/ticket/38682
+        configure.optflags-append -fno-blocks
     }
 
     if {[string match "*10.5*" ${configure.sdkroot}] ||
@@ -243,9 +242,13 @@
 
 platform powerpc {
     # https://trac.macports.org/ticket/37839
-    configure.optflags -Os
+    configure.optflags-replace -O2 -Os
 }
 
+if {[string match *clang* ${configure.compiler}]} {
+    configure.cxxflags-append -Wno-c++11-extensions
+}
+
 livecheck.type  regex
 livecheck.url   http://webkitgtk.org/?page=download
 livecheck.regex webkitgtk-(\[0-9\]+\\.\[0-9\]*\[02468\]\\.\[0-9\]+)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130831/5b89104a/attachment.html>