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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 430f91d2b541854b599a6e40a5359f2b53c7a52c
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 04:21:17 2010 +0000

    2010-10-04  Matt Mueller  <mattm at chromium.org>
    
            Reviewed by Darin Fisher.
    
            When building under chromium, build libwebkit as the same type (shared
            or static) as chromium.  Fixes problems with multiple calls to global
            initializers/finalizers in shared chromium build.
            https://bugs.webkit.org/show_bug.cgi?id=46762
    
            * WebKit.gyp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69067 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 6c47b21..b037061 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-04  Matt Mueller  <mattm at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        When building under chromium, build libwebkit as the same type (shared
+        or static) as chromium.  Fixes problems with multiple calls to global
+        initializers/finalizers in shared chromium build.
+        https://bugs.webkit.org/show_bug.cgi?id=46762
+
+        * WebKit.gyp:
+
 2010-10-04  Alpha Lam  <hclam at chromium.org>
 
         Build fix. Not reviewed.
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index 6b5108f..4cc951b 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -36,7 +36,6 @@
         'features.gypi',
     ],
     'variables': {
-        'webkit_target_type': 'static_library',
         'conditions': [
             # Location of the chromium src directory and target type is different
             # if webkit is built inside chromium or as standalone project.
@@ -44,6 +43,7 @@
                 # Webkit is being built outside of the full chromium project.
                 # e.g. via build-webkit --chromium
                 'chromium_src_dir': '../../WebKit/chromium',
+                'webkit_target_type': 'static_library',
 
                 # List of DevTools source files, ordered by dependencies. It is used both
                 # for copying them to resource dir, and for generating 'devtools.html' file.
@@ -54,6 +54,7 @@
             },{
                 # WebKit is checked out in src/chromium/third_party/WebKit
                 'chromium_src_dir': '../../../..',
+                'webkit_target_type': '<(library)',
 
                 'devtools_files': [
                     '<@(devtools_css_files)',

-- 
WebKit Debian packaging