[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:02 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit bd81406c322763eb53f0da1f9f68cad3b12592cf
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 17 17:05:30 2010 +0000
Fixed link errors in WebCore build on Mac
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65512 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ANGLE/ANGLE.xcodeproj/project.pbxproj b/ANGLE/ANGLE.xcodeproj/project.pbxproj
index 0cd7c7e..67fa654 100644
--- a/ANGLE/ANGLE.xcodeproj/project.pbxproj
+++ b/ANGLE/ANGLE.xcodeproj/project.pbxproj
@@ -461,6 +461,7 @@
isa = PBXProject;
buildConfigurationList = FB39D0731200ED9200088E69 /* Build configuration list for PBXProject "ANGLE" */;
compatibilityVersion = "Xcode 2.4";
+ developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
@@ -556,6 +557,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 5D7C59C61208C68B001C873E /* Base.xcconfig */;
buildSettings = {
+ GCC_SYMBOLS_PRIVATE_EXTERN = NO;
};
name = Production;
};
@@ -563,6 +565,8 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 5D7C59C51208C68B001C873E /* ANGLE.xcconfig */;
buildSettings = {
+ GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
+ GCC_SYMBOLS_PRIVATE_EXTERN = NO;
};
name = Production;
};
@@ -571,6 +575,7 @@
baseConfigurationReference = 5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */;
buildSettings = {
GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_SYMBOLS_PRIVATE_EXTERN = NO;
};
name = Debug;
};
@@ -578,6 +583,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */;
buildSettings = {
+ GCC_SYMBOLS_PRIVATE_EXTERN = NO;
};
name = Release;
};
@@ -585,6 +591,8 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 5D7C59C51208C68B001C873E /* ANGLE.xcconfig */;
buildSettings = {
+ GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
+ GCC_SYMBOLS_PRIVATE_EXTERN = NO;
};
name = Debug;
};
@@ -592,6 +600,8 @@
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 1f578b5..2dfc890 100644
--- a/ANGLE/ChangeLog
+++ b/ANGLE/ChangeLog
@@ -1,3 +1,15 @@
+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
+ GCC_SYMBOLS_PRIVATE_EXTERN to NO to match WebCore
+ flags.
+
+ * ANGLE.xcodeproj/project.pbxproj:
+
2010-08-04 Kenneth Russell <kbr at google.com>
Reviewed by Dimitri Glazkov.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list