[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[kevino at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 8caa00ad84e358c7d0d593f63672acf236f9f2f9
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 25 01:13:23 2009 +0000

    wx build fix. SnowLeopard fixes for Mac dependencies.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48741 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d4e2ae4..ad0ab61 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2009-09-24  Kevin Ollivier  <kevino at theolliviers.com>
+
+        wx build fix. SnowLeopard fixes for Mac dependencies.
+
+        * wx/build/build_utils.py:
+        * wx/build/settings.py:
+        * wx/install-unix-extras:
+
 2009-09-24  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Oliver Hunt.
diff --git a/WebKitTools/wx/build/build_utils.py b/WebKitTools/wx/build/build_utils.py
index 954fb1b..0a795a8 100644
--- a/WebKitTools/wx/build/build_utils.py
+++ b/WebKitTools/wx/build/build_utils.py
@@ -26,6 +26,7 @@
 import commands
 import glob
 import os
+import platform
 import shutil
 import sys
 import urllib
@@ -105,7 +106,7 @@ def download_if_newer(url, destdir):
     
     return None
     
-def update_wx_deps(wk_root, msvc_version='msvc2008'):
+def update_wx_deps(conf, wk_root, msvc_version='msvc2008'):
     """
     Download and update tools needed to build the wx port.
     """
@@ -131,6 +132,10 @@ def update_wx_deps(wk_root, msvc_version='msvc2008'):
             os.system('unzip -o %s -d %s' % (archive, os.path.join(wklibs_dir, msvc_version)))
     
     elif sys.platform.startswith('darwin'):
+        # export the right compiler for building the dependencies
+        if platform.release().startswith('10'): # Snow Leopard
+            os.environ['CC'] = conf.env['CC'][0]
+            os.environ['CXX'] = conf.env['CXX'][0]
         os.system('%s/WebKitTools/wx/install-unix-extras' % wk_root)
         
 def includeDirsForSources(sources):
diff --git a/WebKitTools/wx/build/settings.py b/WebKitTools/wx/build/settings.py
index 960f483..44b7632 100644
--- a/WebKitTools/wx/build/settings.py
+++ b/WebKitTools/wx/build/settings.py
@@ -217,10 +217,12 @@ def common_configure(conf):
     if sys.platform.startswith('darwin') and build_port == 'wx':
         import platform
         if platform.release().startswith('10'): # Snow Leopard
-            wxconfig = commands.getoutput('%s --selected-config' % get_path_to_wxconfig())
             # wx currently only supports 32-bit compilation, so we want gcc-4.0 instead of 4.2 on Snow Leopard
-            conf.env['CC'] = 'gcc-4.0'
-            conf.env['CXX'] = 'g++-4.0'
+            # unless the user has explicitly set a different compiler.
+            if not "CC" in os.environ:
+                conf.env['CC'] = 'gcc-4.0'
+            if not "CXX" in os.environ:
+                conf.env['CXX'] = 'g++-4.0'
     conf.check_tool('compiler_cxx')
     conf.check_tool('compiler_cc')
     if Options.options.wxpython:
@@ -247,7 +249,7 @@ def common_configure(conf):
        conf.env.append_value('CXXDEFINES', ['WTF_USE_%s' % use])
     
     if build_port == "wx":
-        update_wx_deps(wk_root, msvc_version)
+        update_wx_deps(conf, wk_root, msvc_version)
     
         conf.env.append_value('CXXDEFINES', ['BUILDING_WX__=1'])
 
diff --git a/WebKitTools/wx/install-unix-extras b/WebKitTools/wx/install-unix-extras
index b3088c0..68d81e4 100755
--- a/WebKitTools/wx/install-unix-extras
+++ b/WebKitTools/wx/install-unix-extras
@@ -68,7 +68,7 @@ ICONV_URL="http://ftp.gnu.org/pub/gnu/libiconv/$ICONV_TARBALL"
 
 LIBJPEG_VERSION="6b"
 LIBJPEG_TARBALL="jpegsrc.v$LIBJPEG_VERSION.tar.gz"
-LIBJPEG_URL="http://www.ijg.org/files/$LIBJPEG_TARBALL"
+LIBJPEG_URL="http://wxwebkit.wxcommunity.com/downloads/deps/$LIBJPEG_TARBALL"
 
 LIBPNG_VERSION="1.2.33"
 LIBPNG_TARBALL="libpng-$LIBPNG_VERSION.tar.gz"

-- 
WebKit Debian packaging