[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:38 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 3215b4ee78daa5d884813524acfbd564aee31ad1
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 2 03:39:01 2010 +0000
Try to fix the GTK build.
* GNUmakefile.am: Added OSAllocator to another project.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73104 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 771a728..64ad068 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,11 @@
2010-12-01 Geoffrey Garen <ggaren at apple.com>
+ Try to fix the GTK build.
+
+ * GNUmakefile.am: Added OSAllocator to another project.
+
+2010-12-01 Geoffrey Garen <ggaren at apple.com>
+
Try to fix the GTK Linux build.
* JavaScriptCore.gypi: Added OSAllocator to the project.
diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index f7806b4..b1a2fb8 100644
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -554,11 +554,13 @@ javascriptcore_sources += \
if TARGET_WIN32
javascriptcore_sources += \
- JavaScriptCore/runtime/MarkStackWin.cpp
+ JavaScriptCore/runtime/MarkStackWin.cpp \
+ wtf/OSAllocatorWin.cpp
else
javascriptcore_sources += \
JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp \
- JavaScriptCore/runtime/MarkStackPosix.cpp
+ JavaScriptCore/runtime/MarkStackPosix.cpp \
+ wtf/OSAllocatorPosix.cpp
endif
# ----
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list