[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:48 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit a0df9308430ab7c6926514b8be501b5debb26f21
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 2 04:38:58 2010 +0000

    Try to fix the GTK build.
    
    * GNUmakefile.am: Use a full path to OSAllocator*.cpp.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73109 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 90e55b7..7175c5d 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: Use a full path to OSAllocator*.cpp.
+
+2010-12-01  Geoffrey Garen  <ggaren at apple.com>
+
         Try to fix the EFL Linux build.
 
         * CMakeListsEfl.txt: Added OSAllocator to the project.
diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index b1a2fb8..89f9ab7 100644
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -555,12 +555,12 @@ javascriptcore_sources += \
 if TARGET_WIN32
 javascriptcore_sources += \
 	JavaScriptCore/runtime/MarkStackWin.cpp \
-	wtf/OSAllocatorWin.cpp
+	JavaScriptCore/wtf/OSAllocatorWin.cpp
 else
 javascriptcore_sources += \
 	JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp \
 	JavaScriptCore/runtime/MarkStackPosix.cpp \
-	wtf/OSAllocatorPosix.cpp
+	JavaScriptCore/wtf/OSAllocatorPosix.cpp
 endif
 
 # ----

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list