Mon Oct 26 10:53:25 2015 UTC ()
Fix build on NetBSD/arm.


(jmcneill)
diff -r1.102 -r1.103 pkgsrc/www/webkit-gtk/Makefile
diff -r1.83 -r1.84 pkgsrc/www/webkit-gtk/distinfo
diff -r0 -r1.1 pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt
diff -r0 -r1.5 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
diff -r1.7 -r0 pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
cvs diff -r1.102 -r1.103 pkgsrc/www/webkit-gtk/Makefile (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/Makefile 2015/10/25 16:48:23 1.102
+++ pkgsrc/www/webkit-gtk/Makefile 2015/10/26 10:53:24 1.103
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.102 2015/10/25 16:48:23 leot Exp $ 1# $NetBSD: Makefile,v 1.103 2015/10/26 10:53:24 jmcneill Exp $
2 2
3DISTNAME= webkitgtk-2.10.2 3DISTNAME= webkitgtk-2.10.2
4PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} 4PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= http://www.webkitgtk.org/releases/ 7MASTER_SITES= http://www.webkitgtk.org/releases/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.webkitgtk.org/ 11HOMEPAGE= http://www.webkitgtk.org/
12COMMENT= GTK port of the WebKit browser engine 12COMMENT= GTK port of the WebKit browser engine
13LICENSE= 2-clause-bsd AND gnu-lgpl-v2 13LICENSE= 2-clause-bsd AND gnu-lgpl-v2
14 14
@@ -59,28 +59,28 @@ CMAKE_ARGS+= -DRUBY_EXECUTABLE=${RUBY} @@ -59,28 +59,28 @@ CMAKE_ARGS+= -DRUBY_EXECUTABLE=${RUBY}
59 59
60PYTHON_FOR_BUILD_ONLY= yes 60PYTHON_FOR_BUILD_ONLY= yes
61PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 1.10.2 61PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 1.10.2
62.include "../../lang/python/application.mk" 62.include "../../lang/python/application.mk"
63CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHONBIN} 63CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHONBIN}
64 64
65CXXFLAGS.SunOS+= -fpermissive 65CXXFLAGS.SunOS+= -fpermissive
66 66
67.include "../../mk/compiler.mk" 67.include "../../mk/compiler.mk"
68.if !empty(PKGSRC_COMPILER:Mclang) 68.if !empty(PKGSRC_COMPILER:Mclang)
69CXXFLAGS+= -std=c++11 -Wno-c++11-narrowing 69CXXFLAGS+= -std=c++11 -Wno-c++11-narrowing
70.endif 70.endif
71 71
72.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) 72.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
73CMAKE_ARGS+= -DUSE_SYSTEM_MALLOC=ON # XXX: not completely sure (was --disable-fast-malloc) 73CMAKE_ARGS+= -DUSE_SYSTEM_MALLOC=ON
74.endif 74.endif
75 75
76.include "options.mk" 76.include "options.mk"
77 77
78BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1 78BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
79.include "../../devel/glib2/buildlink3.mk" 79.include "../../devel/glib2/buildlink3.mk"
80BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.5 80BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.5
81BUILDLINK_DEPMETHOD.gobject-introspection+= build 81BUILDLINK_DEPMETHOD.gobject-introspection+= build
82.include "../../devel/gobject-introspection/buildlink3.mk" 82.include "../../devel/gobject-introspection/buildlink3.mk"
83CMAKE_ARGS+= -DENABLE_INTROSPECTION=ON 83CMAKE_ARGS+= -DENABLE_INTROSPECTION=ON
84.include "../../devel/zlib/buildlink3.mk" 84.include "../../devel/zlib/buildlink3.mk"
85.include "../../databases/sqlite3/buildlink3.mk" 85.include "../../databases/sqlite3/buildlink3.mk"
86# A correct Webkit build requires flex 2.5.33 86# A correct Webkit build requires flex 2.5.33
cvs diff -r1.83 -r1.84 pkgsrc/www/webkit-gtk/distinfo (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/distinfo 2015/10/25 16:48:23 1.83
+++ pkgsrc/www/webkit-gtk/distinfo 2015/10/26 10:53:24 1.84
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: distinfo,v 1.83 2015/10/25 16:48:23 leot Exp $ 1$NetBSD: distinfo,v 1.84 2015/10/26 10:53:24 jmcneill Exp $
2 2
3SHA1 (webkitgtk-2.10.2.tar.xz) = 34743186985299355eb84c04a944c7decf21a8e6 3SHA1 (webkitgtk-2.10.2.tar.xz) = 34743186985299355eb84c04a944c7decf21a8e6
4RMD160 (webkitgtk-2.10.2.tar.xz) = 768d1a1e3af7497369af9392815101b7004139ce 4RMD160 (webkitgtk-2.10.2.tar.xz) = 768d1a1e3af7497369af9392815101b7004139ce
5SHA512 (webkitgtk-2.10.2.tar.xz) = a83f1774c0ad65def6c90ba6117579477bd37fc7d0683a72887ec688e25fd84c3930cdf8538e6bbf8f2f57cf4515553eb29fb43679cffe35bdf108b04c08a387 5SHA512 (webkitgtk-2.10.2.tar.xz) = a83f1774c0ad65def6c90ba6117579477bd37fc7d0683a72887ec688e25fd84c3930cdf8538e6bbf8f2f57cf4515553eb29fb43679cffe35bdf108b04c08a387
6Size (webkitgtk-2.10.2.tar.xz) = 11011532 bytes 6Size (webkitgtk-2.10.2.tar.xz) = 11011532 bytes
 7SHA1 (patch-CMakeLists.txt) = e5834d3935c4a25ab4aeb7210d0ccbffc012b670
 8SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 2b1eadc7a11b37dc36a7491f30bf72a6dddf5725
7SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 1c5e0113e939163a69115809148dc184e64839ae 9SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 1c5e0113e939163a69115809148dc184e64839ae
8SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 9b36b50f28bcb9421ac8b0ed17bba02de6d34e16 10SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 9b36b50f28bcb9421ac8b0ed17bba02de6d34e16
9SHA1 (patch-Source_JavaScriptCore_runtime_Options.cpp) = f8244c0f22bdb1ad29cb9abcfe0654173cedbe04 11SHA1 (patch-Source_JavaScriptCore_runtime_Options.cpp) = f8244c0f22bdb1ad29cb9abcfe0654173cedbe04
10SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092 12SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092
11SHA1 (patch-Source_WTF_wtf_MathExtras.h) = ba957541a8b70e77707013bb5a93abbeb1829c75 13SHA1 (patch-Source_WTF_wtf_MathExtras.h) = ba957541a8b70e77707013bb5a93abbeb1829c75
12SHA1 (patch-Source_WTF_wtf_Platform.h) = cbf239e3b05909b63a33fbe5ced4f8b8743ce4aa 
13SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = dfc5d06c3ec7112bdacabd0e66dd2ee6564f4ab3 14SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = dfc5d06c3ec7112bdacabd0e66dd2ee6564f4ab3
14SHA1 (patch-Source_cmake_OptionsCommon.cmake) = f7b869cc197e9f2341566e5bcd4c4190e394ea29 15SHA1 (patch-Source_cmake_OptionsCommon.cmake) = f7b869cc197e9f2341566e5bcd4c4190e394ea29
15SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 620bfd4bae3eaf638fda0a1da3707e842a34adab 16SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 620bfd4bae3eaf638fda0a1da3707e842a34adab
16SHA1 (patch-ai) = f0b059fe71022e961903655f5c2a5205fe452968 17SHA1 (patch-ai) = f0b059fe71022e961903655f5c2a5205fe452968
17SHA1 (patch-aj) = 8247194bd8d62fcc356650c946756898fbe22982 18SHA1 (patch-aj) = 8247194bd8d62fcc356650c946756898fbe22982
File Added: pkgsrc/www/webkit-gtk/patches/Attic/patch-CMakeLists.txt
$NetBSD: patch-CMakeLists.txt,v 1.1 2015/10/26 10:53:25 jmcneill Exp $

--- CMakeLists.txt.orig	2015-10-25 17:30:21.000000000 +0000
+++ CMakeLists.txt
@@ -87,6 +87,8 @@ else ()
 endif ()
 if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
     set(WTF_CPU_ARM 1)
+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^earm")
+    set(WTF_CPU_ARM 1)
 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
     set(WTF_CPU_ARM64 1)
 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
File Added: pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
$NetBSD: patch-Source_JavaScriptCore_assembler_ARMAssembler.h,v 1.5 2015/10/26 10:53:25 jmcneill Exp $

--- Source/JavaScriptCore/assembler/ARMAssembler.h.orig	2015-10-15 08:20:12.000000000 +0000
+++ Source/JavaScriptCore/assembler/ARMAssembler.h
@@ -29,6 +29,11 @@
 
 #if ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL)
 
+#if defined(__NetBSD__)
+#include <sys/types.h>
+#include <machine/sysarch.h>
+#endif
+
 #include "AssemblerBufferWithConstantPool.h"
 #include "JITCompilationEffort.h"
 #include <wtf/Assertions.h>
@@ -1128,6 +1133,11 @@ namespace JSC {
                 linuxPageFlush(current, current + page);
 
             linuxPageFlush(current, end);
+#elif defined(__NetBSD__)
+            struct arm_sync_icache_args arg;
+            arg.addr = reinterpret_cast<uintptr_t>(code);
+            arg.len = size;
+            sysarch(ARM_SYNC_ICACHE, (void *)&arg);
 #else
 #error "The cacheFlush support is missing on this platform."
 #endif
File Deleted: pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_WTF_wtf_Platform.h