[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-142-g786665c

[andreip at google.com]

The following commit has been merged in the debian/experimental branch:
commit 4b59addbdeb5eee589e0630af6c0fa239df327f8
Author: andreip at google.com <andreip at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 22 13:23:11 2010 +0000

    2010-12-22  Andrei Popescu  <andreip at google.com>
    
            Unreviewed build fix.
    
            Fix Chromium Linux shared library build.
            [Chromium] r74431 broke the Chromium Linux shared library build
            https://bugs.webkit.org/show_bug.cgi?id=51462
    
            * JavaScriptCore.gyp/JavaScriptCore.gyp:
            * JavaScriptCore.gypi:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74474 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 5db1d21..42ac612 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-22  Andrei Popescu  <andreip at google.com>
+
+        Unreviewed build fix.
+
+        Fix Chromium Linux shared library build.
+        [Chromium] r74431 broke the Chromium Linux shared library build
+        https://bugs.webkit.org/show_bug.cgi?id=51462
+
+        * JavaScriptCore.gyp/JavaScriptCore.gyp:
+        * JavaScriptCore.gypi:
+
 2010-12-21  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r74462.
diff --git a/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp b/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
index d75fccf..ff7f0de 100644
--- a/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
+++ b/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
@@ -147,7 +147,9 @@
           'sources/': [
             ['exclude', 'ThreadIdentifierDataPthreads\\.(h|cpp)$'],
             ['exclude', 'ThreadingPthreads\\.cpp$'],
-            ['include', 'Thread(ing|Specific)Win\\.cpp$']
+            ['include', 'Thread(ing|Specific)Win\\.cpp$'],
+            ['exclude', 'OSAllocatorPosix\\.cpp$'],
+            ['include', 'OSAllocatorWin\\.cpp$']
           ],
           'include_dirs!': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit',
diff --git a/JavaScriptCore/JavaScriptCore.gypi b/JavaScriptCore/JavaScriptCore.gypi
index bd19875..6b04168 100644
--- a/JavaScriptCore/JavaScriptCore.gypi
+++ b/JavaScriptCore/JavaScriptCore.gypi
@@ -399,6 +399,7 @@
             'wtf/NonCopyingSort.h',
             'wtf/Noncopyable.h',
             'wtf/NotFound.h',
+            'wtf/OSAllocatorPosix.cpp',
             'wtf/OSAllocatorWin.cpp',
             'wtf/OSAllocator.h',
             'wtf/OwnArrayPtr.h',

-- 
WebKit Debian packaging