Title: [157578] tags/Safari-538.2/Source/WebKit2
- Revision
- 157578
- Author
- lforsch...@apple.com
- Date
- 2013-10-17 09:57:47 -0700 (Thu, 17 Oct 2013)
Log Message
Merged r157561. <rdar://problem/15183901>
Modified Paths
Diff
Modified: tags/Safari-538.2/Source/WebKit2/ChangeLog (157577 => 157578)
--- tags/Safari-538.2/Source/WebKit2/ChangeLog 2013-10-17 16:19:19 UTC (rev 157577)
+++ tags/Safari-538.2/Source/WebKit2/ChangeLog 2013-10-17 16:57:47 UTC (rev 157578)
@@ -1,3 +1,25 @@
+2013-10-17 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r157561
+
+ 2013-10-17 Mark Rowe <mr...@apple.com>
+
+ <rdar://problem/15183901> WebKit2 XPC services load the wrong frameworks when running
+ from the staged frameworks location.
+
+ Build the XPC services with DYLD_VERSIONED_FRAMEWORK_PATH when USE_STAGING_INSTALL_PATH
+ is set to YES. This is necessary because there's no way to specify environment variables
+ to be used when an XPC service is launched.
+
+ Reviewed by Anders Carlsson.
+
+ * Configurations/BaseTarget.xcconfig: Set OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH to contain the
+ DYLD_VERSIONED_FRAMEWORK_PATH value when USE_STAGING_INSTALL_PATH is YES.
+ * Configurations/BaseXPCService.xcconfig: Include OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH in the
+ value of OTHER_LDFLAGS.
+ * Configurations/PluginService.32.xcconfig: Ditto.
+ * Configurations/PluginService.64.xcconfig: Ditto.
+
2013-10-15 Brady Eidson <beid...@apple.com>
Flesh out the DatabaseProcess (and launch it!)
Modified: tags/Safari-538.2/Source/WebKit2/Configurations/BaseTarget.xcconfig (157577 => 157578)
--- tags/Safari-538.2/Source/WebKit2/Configurations/BaseTarget.xcconfig 2013-10-17 16:19:19 UTC (rev 157577)
+++ tags/Safari-538.2/Source/WebKit2/Configurations/BaseTarget.xcconfig 2013-10-17 16:57:47 UTC (rev 157578)
@@ -51,3 +51,6 @@
UMBRELLA_FRAMEWORKS_DIR_engineering = $(BUILT_PRODUCTS_DIR);
WEBCORE_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
+
+OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH = $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_$(USE_STAGING_INSTALL_PATH));
+OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES = -Wl,-dyld_env -Wl,DYLD_VERSIONED_FRAMEWORK_PATH=/System/Library/StagedFrameworks/Safari;
Modified: tags/Safari-538.2/Source/WebKit2/Configurations/BaseXPCService.xcconfig (157577 => 157578)
--- tags/Safari-538.2/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2013-10-17 16:19:19 UTC (rev 157577)
+++ tags/Safari-538.2/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2013-10-17 16:57:47 UTC (rev 157578)
@@ -41,3 +41,5 @@
SKIP_INSTALL_1070 = YES;
SKIP_INSTALL_1080 = NO;
SKIP_INSTALL_1090 = NO;
+
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
Modified: tags/Safari-538.2/Source/WebKit2/Configurations/PluginService.32.xcconfig (157577 => 157578)
--- tags/Safari-538.2/Source/WebKit2/Configurations/PluginService.32.xcconfig 2013-10-17 16:19:19 UTC (rev 157577)
+++ tags/Safari-538.2/Source/WebKit2/Configurations/PluginService.32.xcconfig 2013-10-17 16:57:47 UTC (rev 157578)
@@ -36,6 +36,6 @@
FRAMEWORK_LDFLAGS_NO = -framework WebKit2;
FRAMEWORK_LDFLAGS_YES = ;
-OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS);
+OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
Modified: tags/Safari-538.2/Source/WebKit2/Configurations/PluginService.64.xcconfig (157577 => 157578)
--- tags/Safari-538.2/Source/WebKit2/Configurations/PluginService.64.xcconfig 2013-10-17 16:19:19 UTC (rev 157577)
+++ tags/Safari-538.2/Source/WebKit2/Configurations/PluginService.64.xcconfig 2013-10-17 16:57:47 UTC (rev 157578)
@@ -36,6 +36,6 @@
FRAMEWORK_LDFLAGS_NO = -framework WebKit2;
FRAMEWORK_LDFLAGS_YES = ;
-OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS);
+OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
