[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 319dfc246f03ca3d1dda5071004afadcdb65010e
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 14 18:51:05 2009 +0000

    wxMac build fix. Ensure 10.4 compatibility for deps, and allow the user to specify
    the SDK to use since Python overrides any user-set value of MACOSX_DEPLOYMENT_TARGET.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49579 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 92fa959..e337e75 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-14  Kevin Ollivier  <kevino at theolliviers.com>
+
+        wxMac build fix. Ensure 10.4 compatibility for deps, and allow the user to specify
+        the SDK to use since Python overrides any user-set value of MACOSX_DEPLOYMENT_TARGET.
+
+        * wx/build/settings.py:
+        * wx/install-unix-extras:
+
 2009-10-14  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKitTools/wx/build/settings.py b/WebKitTools/wx/build/settings.py
index f04630d..546b09d 100644
--- a/WebKitTools/wx/build/settings.py
+++ b/WebKitTools/wx/build/settings.py
@@ -204,6 +204,7 @@ def common_set_options(opt):
     opt.add_option('--wxpython', action='store_true', default=False, help='Create the wxPython bindings.')
     opt.add_option('--wx-compiler-prefix', action='store', default='vc',
                    help='Specify a different compiler prefix (do this if you used COMPILER_PREFIX when building wx itself)')
+    opt.add_option('--macosx-version', action='store', default='', help="Version of OS X to build for.")
 
 def common_configure(conf):
     """
@@ -250,7 +251,7 @@ def common_configure(conf):
     
     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)
     
@@ -266,7 +267,7 @@ def common_configure(conf):
             conf.env['CPPPATH_WX'] = wxincludes
             conf.env['LIB_WX'] = wxlibs
             conf.env['LIBPATH_WX'] = wxlibpaths
-    
+
     if sys.platform.startswith('darwin'):
         conf.env['LIB_ICU'] = ['icucore']
         # Apple does not ship the ICU headers with Mac OS X, so WebKit includes a copy of 3.2 headers
@@ -275,15 +276,33 @@ def common_configure(conf):
         conf.env.append_value('CPPPATH', wklibs_dir)
         conf.env.append_value('LIBPATH', wklibs_dir)
         
-        # WebKit only supports 10.4+
+        min_version = None
+        
         mac_target = 'MACOSX_DEPLOYMENT_TARGET'
-        if mac_target in os.environ and os.environ[mac_target] == '10.3':
-            os.environ[mac_target] = '10.4'
+        if mac_target in conf.env:
+             min_version = conf.env[mac_target]
+
+        if Options.options.macosx_version != '':
+            min_version = Options.options.macosx_version
+
+        # WebKit only supports 10.4+, but ppc systems often set this to earlier systems
+        if not min_version or min_version in ['10.1','10.2','10.3']:
+            min_version = '10.4'
+            
+        os.environ[mac_target] = conf.env[mac_target] = min_version
         
-        if mac_target in conf.env and conf.env[mac_target] == '10.3':
-            conf.env[mac_target] = '10.4'
-    
-    #conf.env['PREFIX'] = output_dir
+        sdk_version = min_version
+        if min_version == "10.4":
+            sdk_version += "u"
+
+        conf.env.append_value('CPPPATH', [os.path.join(wklibs_dir, 'WebCoreSQLite3')])
+        conf.env.append_value('LIB', ['WebCoreSQLite3'])
+            
+        sdkroot = '/Developer/SDKs/MacOSX%s.sdk' % sdk_version
+        sdkflags = ['-arch', 'i386', '-isysroot', sdkroot]
+        
+        conf.env.append_value('CPPFLAGS_SQLITE3', sdkflags)
+        conf.env.append_value('LINKFLAGS_SQLITE3', sdkflags)
     
     libprefix = ''
     if building_on_win32:
@@ -339,8 +358,6 @@ def common_configure(conf):
         conf.check_cfg(msg='Checking for libxslt', path='xslt-config', args='--cflags --libs', package='', uselib_store='XSLT', mandatory=True)
         conf.check_cfg(path='xml2-config', args='--cflags --libs', package='', uselib_store='XML', mandatory=True)
         conf.check_cfg(path='curl-config', args='--cflags --libs', package='', uselib_store='CURL', mandatory=True)
-        if sys.platform.startswith('darwin'):
-            conf.env.append_value('LIB', ['WebCoreSQLite3'])
         
         if not sys.platform.startswith('darwin'):
             conf.check_cfg(package='cairo', args='--cflags --libs', uselib_store='WX', mandatory=True)
diff --git a/WebKitTools/wx/install-unix-extras b/WebKitTools/wx/install-unix-extras
index 68d81e4..fda63c9 100755
--- a/WebKitTools/wx/install-unix-extras
+++ b/WebKitTools/wx/install-unix-extras
@@ -74,6 +74,8 @@ LIBPNG_VERSION="1.2.33"
 LIBPNG_TARBALL="libpng-$LIBPNG_VERSION.tar.gz"
 LIBPNG_URL="http://wxwebkit.wxcommunity.com/downloads/deps/$LIBPNG_TARBALL"
 
+export MAC_OS_X_DEPLOYMENT_TARGET=10.4
+
 cd $DL_DIR
 # build ICU
 if [ `which icu-config >/dev/null 2>&1` ]; then

-- 
WebKit Debian packaging