cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix QtWebkit on amd64. With the default 512Mb datasize ulimit, any app

Browse Source 
using it crashes right away at startup, since it tries to preallocate
1Gb of memory.

From webkit's patch-Source_JavaScriptCore_jit_ExecutableAllocatorFixedVMPool_cpp
tested with mnemosyne & arora.
This commit is contained in:
landry 2012-11-05 16:29:50 +00:00
parent 1a7879570c
commit c4c6cd0dc5
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/qt4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.104 2012/10/11 01:18:09 sthen Exp $
# $OpenBSD: Makefile,v 1.105 2012/11/05 16:29:50 landry Exp $
ONLY_FOR_ARCHS = ${GCC4_ARCHS}
SHARED_ONLY = Yes
@ -24,7 +24,7 @@ PKGNAME-debug = qt4-debug-${PKGVERSION}
FULLPKGNAME-html = qt4-html-${PKGVERSION}
FULLPKGPATH-html = ${BASE_PKGPATH},-html
REVISION-main= 3
REVISION-main= 4
REVISION-mysql= 0
REVISION-postgresql= 0
REVISION-examples= 0

16
x11/qt4/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_ExecutableAllocatorFixedVMPool_cpp Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_ExecutableAllocatorFixedVMPool_cpp,v 1.1 2012/11/05 16:29:51 landry Exp $
https://bugs.webkit.org/show_bug.cgi?id=61137
from www/webkit/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocatorFixedVMPool_cpp
--- src/3rdparty/webkit/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp.orig Mon Nov 5 15:21:42 2012
+++ src/3rdparty/webkit/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp Mon Nov 5 15:21:57 2012
@@ -392,7 +392,8 @@ typedef AllocationTableDirectory<LazyAllocationTable<P
#if CPU(ARM)
typedef PageTables16MB FixedVMPoolPageTables;
-#elif CPU(X86_64)
+// We don't want an initial allocation of 1GB, it's above the default ulimit
+#elif CPU(X86_64) && !defined(__OpenBSD__)
typedef PageTables1GB FixedVMPoolPageTables;
#else
typedef PageTables32MB FixedVMPoolPageTables;