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

aroben at apple.com aroben at apple.com
Wed Dec 22 11:22:35 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 03dfa8e269cc81fd901e8b3836dbacf83f413d55
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 20 23:40:30 2010 +0000

    Stop linking WebKitTestRunner against getopt
    
    Use of getopt was removed in r63700.
    
    Fixes <http://webkit.org/b/42714> WebKitTestRunner links against
    getopt, but doesn't need to
    
    Reviewed by Sam Weinig.
    
    * WebKitTestRunner/win/WebKitTestRunner.vcproj: Removed getopt.lib
    from all configurations.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63788 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 068d61b..e473802 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,19 @@
 2010-07-20  Adam Roben  <aroben at apple.com>
 
+        Stop linking WebKitTestRunner against getopt
+
+        Use of getopt was removed in r63700.
+
+        Fixes <http://webkit.org/b/42714> WebKitTestRunner links against
+        getopt, but doesn't need to
+
+        Reviewed by Sam Weinig.
+
+        * WebKitTestRunner/win/WebKitTestRunner.vcproj: Removed getopt.lib
+        from all configurations.
+
+2010-07-20  Adam Roben  <aroben at apple.com>
+
         Make run-webkit-tests --webkit-test-runner "work" on Windows
 
         WebKitTestRunner crashes on launch, but at least the scripts build and
diff --git a/WebKitTools/WebKitTestRunner/win/WebKitTestRunner.vcproj b/WebKitTools/WebKitTestRunner/win/WebKitTestRunner.vcproj
index 38f91c3..4802c3a 100644
--- a/WebKitTools/WebKitTestRunner/win/WebKitTestRunner.vcproj
+++ b/WebKitTools/WebKitTestRunner/win/WebKitTestRunner.vcproj
@@ -56,7 +56,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/NXCOMPAT"
-				AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib getopt$(LibraryConfigSuffix).lib"
+				AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -128,7 +128,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/NXCOMPAT"
-				AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib getopt$(LibraryConfigSuffix).lib"
+				AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -199,7 +199,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/NXCOMPAT"
-				AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib getopt$(LibraryConfigSuffix).lib"
+				AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib"
 				SubSystem="1"
 			/>
 			<Tool
@@ -269,7 +269,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/NXCOMPAT"
-				AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib getopt$(LibraryConfigSuffix).lib"
+				AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib"
 				SubSystem="1"
 			/>
 			<Tool

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list