[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
ggaren at apple.com
ggaren at apple.com
Wed Dec 22 17:53:46 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 77d8b047b12463c96a48f8597a1e5d65731cd646
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 2 04:28:23 2010 +0000
Try to fix the EFL Linux build.
* CMakeListsEfl.txt: Added OSAllocator to the project.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73108 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/CMakeListsEfl.txt b/JavaScriptCore/CMakeListsEfl.txt
index 90ee22b..9d3c71e 100644
--- a/JavaScriptCore/CMakeListsEfl.txt
+++ b/JavaScriptCore/CMakeListsEfl.txt
@@ -2,6 +2,7 @@ LIST(APPEND JavaScriptCore_SOURCES
jit/ExecutableAllocatorFixedVMPool.cpp
jit/ExecutableAllocator.cpp
runtime/MarkStackPosix.cpp
+ wtf/OSAllocatorPosix.cpp
)
LIST(APPEND JavaScriptCore_LIBRARIES
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index f26db79..90e55b7 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,11 @@
2010-12-01 Geoffrey Garen <ggaren at apple.com>
+ Try to fix the EFL Linux build.
+
+ * CMakeListsEfl.txt: Added OSAllocator to the project.
+
+2010-12-01 Geoffrey Garen <ggaren at apple.com>
+
Try to fix the Qt build: Include all OS files for Qt's sake, and then
use #ifdefs in the files to exclude things based on OS.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list