[pkgsrc/trunk]: pkgsrc/www/webkit-gtk Fix build on SunOS (disable jit, avoid ...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/21b5c8ed48a1
branches:  trunk
changeset: 639549:21b5c8ed48a1
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Sep 16 11:56:13 2014 +0000

description:
Fix build on SunOS (disable jit, avoid re-definining std:: functions).

diffstat:

 www/webkit-gtk/distinfo                                  |   3 ++-
 www/webkit-gtk/options.mk                                |   8 +++++---
 www/webkit-gtk/patches/patch-Source_WTF_wtf_MathExtras.h |  15 +++++++++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diffs (58 lines):

diff -r 9511eb3c9f10 -r 21b5c8ed48a1 www/webkit-gtk/distinfo
--- a/www/webkit-gtk/distinfo   Tue Sep 16 09:52:05 2014 +0000
+++ b/www/webkit-gtk/distinfo   Tue Sep 16 11:56:13 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.68 2014/09/01 21:06:45 wiz Exp $
+$NetBSD: distinfo,v 1.69 2014/09/16 11:56:13 jperkin Exp $
 
 SHA1 (webkitgtk-2.4.5.tar.xz) = a0084746de2cf18246d7b5216086db8133c9df4b
 RMD160 (webkitgtk-2.4.5.tar.xz) = 7cc5bf1a8ac9101b4b8a2c1cce96cd1dd7403bc2
@@ -8,6 +8,7 @@
 SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = fdd31fcf6c745394499570397c82fe3dfce02e1d
 SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 67f66ca254f958c0650249485a64982b40f92621
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092
+SHA1 (patch-Source_WTF_wtf_MathExtras.h) = bce39efce126793c2a33ab99224ca44860273a5b
 SHA1 (patch-Source_WTF_wtf_Platform.h) = 5ff82e77d1d5dea5514adbeede14fd4a8923dc9c
 SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = 2835657e04cdbc0cc7be8a6793061f0b98f84224
 SHA1 (patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp) = 994d1671ff2d8e3a961b9b7ed34f69215ed46f91
diff -r 9511eb3c9f10 -r 21b5c8ed48a1 www/webkit-gtk/options.mk
--- a/www/webkit-gtk/options.mk Tue Sep 16 09:52:05 2014 +0000
+++ b/www/webkit-gtk/options.mk Tue Sep 16 11:56:13 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2014/08/03 22:30:05 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2014/09/16 11:56:13 jperkin Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.webkit-gtk
@@ -7,8 +7,10 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-# XXX JIT produces invalid code on NetBSD/i386 and NetBSD/amd64
-.if empty(MACHINE_PLATFORM:MNetBSD-*-i386) && empty(MACHINE_PLATFORM:MNetBSD-*-x86_64)
+# XXX JIT produces invalid code
+.if empty(MACHINE_PLATFORM:MNetBSD-*-i386) \
+ && empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) \
+ && empty(MACHINE_PLATFORM:MSunOS-*)
 PKG_SUGGESTED_OPTIONS+= webkit-jit
 .endif
 
diff -r 9511eb3c9f10 -r 21b5c8ed48a1 www/webkit-gtk/patches/patch-Source_WTF_wtf_MathExtras.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/webkit-gtk/patches/patch-Source_WTF_wtf_MathExtras.h  Tue Sep 16 11:56:13 2014 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_WTF_wtf_MathExtras.h,v 1.3 2014/09/16 11:56:13 jperkin Exp $
+
+Avoid broken section for SunOS/gcc.
+
+--- Source/WTF/wtf/MathExtras.h.orig   2014-08-25 12:50:32.000000000 +0000
++++ Source/WTF/wtf/MathExtras.h
+@@ -76,7 +76,7 @@ inline double wtf_ceil(double x) { retur
+ 
+ #endif
+ 
+-#if OS(SOLARIS)
++#if OS(notSOLARIS)
+ 
+ namespace std {
+