[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

cblu cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:24:21 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 781a5a11420566d00c68e7bac3004acb185edfdc
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 27 23:44:32 2004 +0000

            Fixed build breakage.
    
            Reviewed by darin.
    
            * WebKit.pbproj/project.pbxproj: Use full patch instead of -L to get at WebKitSecurity.a
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5994 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index faba7d8..1cd248f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,13 @@
 2004-01-27  Chris Blumenberg  <cblu at apple.com>
 
+        Fixed build breakage.
+
+        Reviewed by darin.
+
+        * WebKit.pbproj/project.pbxproj: Use full patch instead of -L to get at WebKitSecurity.a
+
+2004-01-27  Chris Blumenberg  <cblu at apple.com>
+
         Fixed: <rdar://problem/3536624>: Webkit 1.2 links against SecurityNssAsn1.framework
 
         Reviewed by Darin.
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index f1e516c..e2e3a2a 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -153,7 +153,7 @@
 				6566F34204C12D14008B3232,
 			);
 			buildSettings = {
-				COMMON_LDFLAGS = "-no-c++filt WebKitSecurity.a";
+				COMMON_LDFLAGS = "-no-c++filt \"$OBJECT_FILE_DIR/WebKitSecurity.a\"";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_CFLAGS = "-DNDEBUG";
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -163,7 +163,7 @@
 				FRAMEWORK_VERSION = A;
 				HEADER_SEARCH_PATHS = "";
 				INSTALL_PATH = /System/Library/Frameworks;
-				LIBRARY_SEARCH_PATHS = "\"$OBJECT_FILE_DIR\"";
+				LIBRARY_SEARCH_PATHS = "";
 				LOCAL_SEG1_ADDR = 0x7000000;
 				MACOSX_DEPLOYMENT_TARGET = 10.2;
 				OPTIMIZATION_CFLAGS = "-Os";

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list