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

kevino at webkit.org kevino at webkit.org
Thu Oct 29 20:49:39 UTC 2009


The following commit has been merged in the webkit-1.1 branch:
commit f82f0071cebb994bc5bbccb587b78945653b221a
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 21 18:25:54 2009 +0000

    wx build fix. Fix for when linking using --as-needed with gcc.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49910 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 66a9ff6..77fdd5d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,11 @@
 2009-10-21  Kevin Ollivier  <kevino at theolliviers.com>
 
+        wx build fix. Fix for when linking using --as-needed with gcc.
+
+        * wx/browser/wscript:
+
+2009-10-21  Kevin Ollivier  <kevino at theolliviers.com>
+
         wxMac 10.4 build fix. Build and link against a version of libcurl new enough
         to support all the features used by CURL backend.
         
diff --git a/WebKitTools/wx/browser/wscript b/WebKitTools/wx/browser/wscript
index 530cd75..d5246c1 100644
--- a/WebKitTools/wx/browser/wscript
+++ b/WebKitTools/wx/browser/wscript
@@ -45,7 +45,7 @@ def build(bld):
         includes = ' '.join(include_paths),
         source = 'browser.cpp',
         target = 'wxBrowser',
-        uselib = 'WX CURL ICU SQLITE3 XSLT XML WXWEBKIT ' + get_config(),
+        uselib = 'WXWEBKIT WX ' + get_config(),
         libpath = [output_dir],
         uselib_local = '',
         install_path = output_dir)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list