[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[kevino at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit cf09b079184bcca29fe23a3a2a86aec5ca53ae1b
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 29 06:11:21 2010 +0000

    [wx] Build fix for MSW, use ThreadingWin.cpp as the Windows pthreads implementation
    implements pthread_t in a way that makes it impossible to check its validity,
    which is needed by ThreadingPthreads.cpp.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54043 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 96eec77..b39f98e 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-28  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] Build fix for MSW, use ThreadingWin.cpp as the Windows pthreads implementation
+        implements pthread_t in a way that makes it impossible to check its validity,
+        which is needed by ThreadingPthreads.cpp.
+
+        * wscript:
+
 2010-01-28  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Gavin Barraclough.
diff --git a/JavaScriptCore/wscript b/JavaScriptCore/wscript
index 356950f..f5a041f 100644
--- a/JavaScriptCore/wscript
+++ b/JavaScriptCore/wscript
@@ -34,13 +34,14 @@ jscore_excludes.extend(get_excludes(jscore_dir, ['*CF.cpp', '*Symbian.cpp']))
 
 sources = []
 
-jscore_excludes.extend(get_excludes(jscore_dir, ['*Win.cpp', '*None.cpp']))
+jscore_excludes.extend(get_excludes(jscore_dir, ['*None.cpp']))
 
 if building_on_win32:
-    jscore_excludes += ['ExecutableAllocatorPosix.cpp', 'MarkStackPosix.cpp']
+    jscore_excludes += ['ExecutableAllocatorPosix.cpp', 'MarkStackPosix.cpp', 'ThreadingPthreads.cpp']
     sources += ['jit/ExecutableAllocatorWin.cpp', 'runtime/MarkStackWin.cpp']
 else:
     jscore_excludes.append('JSStringRefBSTR.cpp')
+    jscore_excludes.extend(get_excludes(jscore_dir, ['*Win.cpp']))
 
 def generate_jscore_derived_sources():
     # build the derived sources
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b3f921b..649a48a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-28  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] Build fix for MSW, use ThreadingWin.cpp as the Windows pthreads implementation
+        implements pthread_t in a way that makes it impossible to check its validity,
+        which is needed by ThreadingPthreads.cpp.
+
+        * DumpRenderTree/wscript:
+        * wx/build/settings.py:
+
 2010-01-28  Andras Becsi  <abecsi at webkit.org>
 
         Adding myself to the committer list. No review needed.
diff --git a/WebKitTools/DumpRenderTree/wscript b/WebKitTools/DumpRenderTree/wscript
index 29eca9a..5e6c597 100644
--- a/WebKitTools/DumpRenderTree/wscript
+++ b/WebKitTools/DumpRenderTree/wscript
@@ -57,7 +57,7 @@ def build(bld):
         includes = ' '.join(include_paths),
         source = sources,
         target = 'DumpRenderTree',
-        uselib = 'WXWEBKIT WX ' + get_config(),
+        uselib = 'JSCORE ICU WXWEBKIT WX ' + get_config(),
         libpath = [output_dir],
         uselib_local = '',
         install_path = output_dir)
diff --git a/WebKitTools/wx/build/settings.py b/WebKitTools/wx/build/settings.py
index df21a81..9b8165d 100644
--- a/WebKitTools/wx/build/settings.py
+++ b/WebKitTools/wx/build/settings.py
@@ -74,7 +74,7 @@ ports = [
 ]
 
 port_uses = {
-    'wx': ['CURL','PTHREADS', 'WXGC'],
+    'wx': ['CURL', 'WXGC'],
 }
 
 jscore_dirs = [
@@ -255,9 +255,6 @@ def common_configure(conf):
 
         # This one also occurs in C code, so disable it there as well.
         conf.env.append_value('CCFLAGS', ['/wd4996'])
-    
-    for use in port_uses[build_port]:
-       conf.env.append_value('CXXDEFINES', ['WTF_USE_%s' % use])
 
     if build_port == "wx":
         update_wx_deps(conf, wk_root, msvc_version)
@@ -355,6 +352,7 @@ def common_configure(conf):
         conf.env['LIB_XSLT'] = ['libxslt']
     else:    
         if build_port == 'wx':
+            port_uses['wx'].append('PTHREADS')
             conf.env.append_value('LIB', ['jpeg', 'png', 'pthread'])
             conf.env.append_value('LIBPATH', os.path.join(wklibs_dir, 'unix', 'lib'))
             conf.env.append_value('CPPPATH', os.path.join(wklibs_dir, 'unix', 'include'))
@@ -375,3 +373,6 @@ def common_configure(conf):
             conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='WX', mandatory=True)
             conf.check_cfg(package='sqlite3', args='--cflags --libs', uselib_store='SQLITE3', mandatory=True)
             conf.check_cfg(path='icu-config', args='--cflags --ldflags', package='', uselib_store='ICU', mandatory=True)
+
+    for use in port_uses[build_port]:
+       conf.env.append_value('CXXDEFINES', ['WTF_USE_%s' % use])

-- 
WebKit Debian packaging