diff options
| author | jperkin <jperkin@pkgsrc.org> | 2014-09-16 11:56:13 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2014-09-16 11:56:13 +0000 |
| commit | f2c2b943a79b8288a12d80350587ffb0ccd6dbf3 (patch) | |
| tree | 843ac5143e753f1008c4b6365f3499faadb4e25c /www | |
| parent | 6a3e6dddbe31362143c12a5176f93bf9e3d47079 (diff) | |
| download | pkgsrc-f2c2b943a79b8288a12d80350587ffb0ccd6dbf3.tar.gz | |
Fix build on SunOS (disable jit, avoid re-definining std:: functions).
Diffstat (limited to 'www')
| -rw-r--r-- | www/webkit-gtk/distinfo | 3 | ||||
| -rw-r--r-- | www/webkit-gtk/options.mk | 8 | ||||
| -rw-r--r-- | www/webkit-gtk/patches/patch-Source_WTF_wtf_MathExtras.h | 15 |
3 files changed, 22 insertions, 4 deletions
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo index 8f4111614e5..f5537f06602 100644 --- a/www/webkit-gtk/distinfo +++ b/www/webkit-gtk/distinfo @@ -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_assembler_MacroAssemblerARM.cpp) = 69221390dd5 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 --git a/www/webkit-gtk/options.mk b/www/webkit-gtk/options.mk index 846a39af44c..6dc2118383f 100644 --- a/www/webkit-gtk/options.mk +++ b/www/webkit-gtk/options.mk @@ -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 @@ PKG_SUGGESTED_OPTIONS= enchant opengl .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 --git a/www/webkit-gtk/patches/patch-Source_WTF_wtf_MathExtras.h b/www/webkit-gtk/patches/patch-Source_WTF_wtf_MathExtras.h new file mode 100644 index 00000000000..9986f4b7770 --- /dev/null +++ b/www/webkit-gtk/patches/patch-Source_WTF_wtf_MathExtras.h @@ -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 { + |