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

cmarrin at apple.com cmarrin at apple.com
Wed Dec 22 12:14:07 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 8df55a4813d599f35e0a48b973621de000203a2b
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 17 17:24:14 2010 +0000

    Moved previous link error fix to Base.xcconfig
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65515 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ANGLE/ANGLE.xcodeproj/project.pbxproj b/ANGLE/ANGLE.xcodeproj/project.pbxproj
index 67fa654..67b6c3f 100644
--- a/ANGLE/ANGLE.xcodeproj/project.pbxproj
+++ b/ANGLE/ANGLE.xcodeproj/project.pbxproj
@@ -557,7 +557,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 5D7C59C61208C68B001C873E /* Base.xcconfig */;
 			buildSettings = {
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 			};
 			name = Production;
 		};
@@ -565,8 +564,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 5D7C59C51208C68B001C873E /* ANGLE.xcconfig */;
 			buildSettings = {
-				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 			};
 			name = Production;
 		};
@@ -575,7 +572,6 @@
 			baseConfigurationReference = 5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */;
 			buildSettings = {
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 			};
 			name = Debug;
 		};
@@ -583,7 +579,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */;
 			buildSettings = {
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 			};
 			name = Release;
 		};
@@ -591,8 +586,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 5D7C59C51208C68B001C873E /* ANGLE.xcconfig */;
 			buildSettings = {
-				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 			};
 			name = Debug;
 		};
@@ -600,8 +593,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 5D7C59C51208C68B001C873E /* ANGLE.xcconfig */;
 			buildSettings = {
-				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 			};
 			name = Release;
 		};
diff --git a/ANGLE/ChangeLog b/ANGLE/ChangeLog
index 2dfc890..44234a8 100644
--- a/ANGLE/ChangeLog
+++ b/ANGLE/ChangeLog
@@ -2,6 +2,15 @@
 
         Unreviewed.
 
+        Moved previous link error fix to Base.xcconfig.
+
+        * ANGLE.xcodeproj/project.pbxproj:
+        * Configurations/Base.xcconfig:
+
+2010-08-17  Chris Marrin  <cmarrin at apple.com>
+
+        Unreviewed.
+
         Got rid of link errors in WebCore.
 
         Changed GCC_INLINES_ARE_PRIVATE_EXTERN to YES and
diff --git a/ANGLE/Configurations/Base.xcconfig b/ANGLE/Configurations/Base.xcconfig
index 62c65f1..e890e3b 100644
--- a/ANGLE/Configurations/Base.xcconfig
+++ b/ANGLE/Configurations/Base.xcconfig
@@ -12,7 +12,8 @@ GCC_MODEL_TUNING = G5;
 GCC_OBJC_CALL_CXX_CDTORS = YES;
 GCC_OPTIMIZATION_LEVEL = s;
 GCC_PRECOMPILE_PREFIX_HEADER = NO;
-GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
+GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 GCC_THREADSAFE_STATICS = NO;
 GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list