[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

barraclough at apple.com barraclough at apple.com
Wed Dec 22 11:29:15 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit cd3f176217683761dc86392ee448ab2af36d65c2
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 27 05:23:28 2010 +0000

    Build fix for !Mac platforms.
    
    * Android.mk:
    * CMakeLists.txt:
    * GNUmakefile.am:
    * JavaScriptCore.gypi:
    * JavaScriptCore.pro:
    * JavaScriptCore.vcproj/WTF/WTF.vcproj:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64106 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk
index 9aa597d..1c715a1 100644
--- a/JavaScriptCore/Android.mk
+++ b/JavaScriptCore/Android.mk
@@ -160,6 +160,7 @@ LOCAL_SRC_FILES := \
 	wtf/FastMalloc.cpp \
 	wtf/HashTable.cpp \
 	wtf/MainThread.cpp \
+	jit/PageAllocation.cpp\
 	wtf/RandomNumber.cpp \
 	wtf/RefCountedLeakCounter.cpp \
 	wtf/TCSystemAlloc.cpp \
diff --git a/JavaScriptCore/CMakeLists.txt b/JavaScriptCore/CMakeLists.txt
index efcc05d..08a0e72 100644
--- a/JavaScriptCore/CMakeLists.txt
+++ b/JavaScriptCore/CMakeLists.txt
@@ -168,6 +168,7 @@ SET(JavaScriptCore_SOURCES
     yarr/RegexJIT.cpp
 
     wtf/DateMath.cpp
+    wtf/PageAllocation.cpp
 )
 SET(JavaScriptCore_HEADERS )
 
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index c82b0f4..a59e478 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,16 @@
 2010-07-26  Gavin Barraclough  <barraclough at apple.com>
 
+        Build fix for !Mac platforms.
+
+        * Android.mk:
+        * CMakeLists.txt:
+        * GNUmakefile.am:
+        * JavaScriptCore.gypi:
+        * JavaScriptCore.pro:
+        * JavaScriptCore.vcproj/WTF/WTF.vcproj:
+
+2010-07-26  Gavin Barraclough  <barraclough at apple.com>
+
         Reviewed by Oliver Hunt.
 
         Bug 43009 - Abstract out page allocation from executable allocators
diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index 8707905..98f491c 100644
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -456,6 +456,8 @@ javascriptcore_sources += \
 	JavaScriptCore/wtf/OwnFastMallocPtr.h \
 	JavaScriptCore/wtf/OwnPtrCommon.h \
 	JavaScriptCore/wtf/OwnPtr.h \
+	JavaScriptCore/wtf/PageAllocation.cpp \
+	JavaScriptCore/wtf/PageAllocation.h \
 	JavaScriptCore/wtf/PassOwnPtr.h \
 	JavaScriptCore/wtf/PassRefPtr.h \
 	JavaScriptCore/wtf/Platform.h \
diff --git a/JavaScriptCore/JavaScriptCore.gypi b/JavaScriptCore/JavaScriptCore.gypi
index 9300da1..9281576 100644
--- a/JavaScriptCore/JavaScriptCore.gypi
+++ b/JavaScriptCore/JavaScriptCore.gypi
@@ -394,6 +394,8 @@
             'wtf/OwnFastMallocPtr.h',
             'wtf/OwnPtr.h',
             'wtf/OwnPtrCommon.h',
+            'wtf/PageAllocation.cpp',
+            'wtf/PageAllocation.h',
             'wtf/PassOwnPtr.h',
             'wtf/PassRefPtr.h',
             'wtf/Platform.h',
diff --git a/JavaScriptCore/JavaScriptCore.pro b/JavaScriptCore/JavaScriptCore.pro
index 84a5c74..2489580 100644
--- a/JavaScriptCore/JavaScriptCore.pro
+++ b/JavaScriptCore/JavaScriptCore.pro
@@ -212,6 +212,7 @@ SOURCES += \
     wtf/qt/MainThreadQt.cpp \
     wtf/qt/StringQt.cpp \
     wtf/qt/ThreadingQt.cpp \
+    wtf/PageAllocation.cpp \
     wtf/RandomNumber.cpp \
     wtf/RefCountedLeakCounter.cpp \
     wtf/symbian/BlockAllocatorSymbian.cpp \
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
index f7652df..7f18f7e 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
@@ -429,6 +429,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\wtf\PageAllocation.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\wtf\PageAllocation.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\wtf\PassOwnPtr.h"
 			>
 		</File>

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list