[webkit-changes] [203598] trunk/Source/WebKit2

Fri, 22 Jul 2016 08:12:06 -0700

Title: [203598] trunk/Source/WebKit2
Revision
203598
Author
m...@apple.com
Date
2016-07-22 08:11:50 -0700 (Fri, 22 Jul 2016)

Log Message

run-safari doesn't work with Safari 10 on 10.11
https://bugs.webkit.org/show_bug.cgi?id=159958
<rdar://problem/27422805>

Reviewed by Alexey Proskuryakov.

Safari’s injected bundle may depend on the newer versions of frameworks installed in a
staging location. Have the engineering builds of the Web Content service look for newer
versions in that location.

* Configurations/BaseTarget.xcconfig: Shortened a linker flag.

* Configurations/BaseXPCService.xcconfig: Increased Mach-O header padding in production
  builds to allow for more dyld environment commands to be added after the fact.

* Configurations/DebugRelease.xcconfig: Have the new
  WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG set to YES for macOS
  engineering builds.

* Configurations/WebContentService.xcconfig: Include the versioned frameworks whenever
  WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG is set to YES. Have the
  value of WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG default to
  the value of USE_STAGING_INSTALL_PATH, while letting DebugRelease.xcconfig override it.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (203597 => 203598)


--- trunk/Source/WebKit2/ChangeLog	2016-07-22 12:40:26 UTC (rev 203597)
+++ trunk/Source/WebKit2/ChangeLog	2016-07-22 15:11:50 UTC (rev 203598)
@@ -1,3 +1,29 @@
+2016-07-22  Dan Bernstein  <m...@apple.com>
+
+        run-safari doesn't work with Safari 10 on 10.11
+        https://bugs.webkit.org/show_bug.cgi?id=159958
+        <rdar://problem/27422805>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Safari’s injected bundle may depend on the newer versions of frameworks installed in a
+        staging location. Have the engineering builds of the Web Content service look for newer
+        versions in that location.
+
+        * Configurations/BaseTarget.xcconfig: Shortened a linker flag.
+
+        * Configurations/BaseXPCService.xcconfig: Increased Mach-O header padding in production
+          builds to allow for more dyld environment commands to be added after the fact.
+
+        * Configurations/DebugRelease.xcconfig: Have the new
+          WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG set to YES for macOS
+          engineering builds.
+
+        * Configurations/WebContentService.xcconfig: Include the versioned frameworks whenever
+          WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG is set to YES. Have the
+          value of WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG default to
+          the value of USE_STAGING_INSTALL_PATH, while letting DebugRelease.xcconfig override it.
+
 2016-07-21  Myles C. Maxfield  <mmaxfi...@apple.com>
 
         Remove support for deprecated SPI inlineMediaPlaybackRequiresPlaysInlineAttribute

Modified: trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig (203597 => 203598)


--- trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig	2016-07-22 12:40:26 UTC (rev 203597)
+++ trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig	2016-07-22 15:11:50 UTC (rev 203598)
@@ -70,7 +70,7 @@
 WEBKIT_LEGACY_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebKitLegacy.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;
+OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES = -Wl,-dyld_env,DYLD_VERSIONED_FRAMEWORK_PATH=/System/Library/StagedFrameworks/Safari;
 
 WK_MANUAL_SANDBOXING_ENABLED[sdk=macosx*] = YES;

Modified: trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig (203597 => 203598)


--- trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig	2016-07-22 12:40:26 UTC (rev 203597)
+++ trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig	2016-07-22 15:11:50 UTC (rev 203598)
@@ -44,7 +44,7 @@
 
 WK_RELOCATABLE_FRAMEWORKS_LDFLAGS = $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS_$(WK_RELOCATABLE_FRAMEWORKS));
 WK_RELOCATABLE_FRAMEWORKS_LDFLAGS_ = $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS_NO);
-WK_RELOCATABLE_FRAMEWORKS_LDFLAGS_NO = -Wl,-headerpad,0xC0; // Leave room for adding the dyld environment commands to a service that wasn't built for relocatable frameworks.
+WK_RELOCATABLE_FRAMEWORKS_LDFLAGS_NO = -Wl,-headerpad,0x130; // Leave room for adding the dyld environment commands to a service that wasn't built for relocatable frameworks or staged installation.
 WK_RELOCATABLE_FRAMEWORKS_LDFLAGS_YES = -Wl,-dyld_env,DYLD_FRAMEWORK_PATH=@executable_path/$(WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK)/..,-dyld_env,DYLD_LIBRARY_PATH=@executable_path/$(WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK)/Frameworks;
 
 WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK = $(WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK_SHALLOW_BUNDLE_$(SHALLOW_BUNDLE));

Modified: trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig (203597 => 203598)


--- trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig	2016-07-22 12:40:26 UTC (rev 203597)
+++ trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig	2016-07-22 15:11:50 UTC (rev 203598)
@@ -56,3 +56,4 @@
 WK_XPC_SERVICE_SUFFIX[sdk=*simulator*] = .Development;
 
 WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT = NO;
+WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG[sdk=macosx*] = YES;

Modified: trunk/Source/WebKit2/Configurations/WebContentService.xcconfig (203597 => 203598)


--- trunk/Source/WebKit2/Configurations/WebContentService.xcconfig	2016-07-22 12:40:26 UTC (rev 203597)
+++ trunk/Source/WebKit2/Configurations/WebContentService.xcconfig	2016-07-22 15:11:50 UTC (rev 203598)
@@ -35,7 +35,7 @@
 INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
 INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).plist;
 
-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_$(WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG)) $(OTHER_LDFLAGS_PLATFORM) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
 OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
 OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/WebProcessShim.dylib;
 
@@ -44,5 +44,10 @@
 WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT_NO = $(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT);
 WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT_YES = $(WK_RELOCATABLE_FRAMEWORKS);
 
+WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG = $(WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG_$(WK_EMPTY_$(WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG)));
+WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG_ = $(WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG_NO);
+WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG_NO = $(WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG);
+WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG_YES = $(USE_STAGING_INSTALL_PATH);
+
 WK_XPC_DOMAIN_EXTENSION_CODE_SIGN_FLAGS = $(WK_XPC_DOMAIN_EXTENSION_CODE_SIGN_FLAGS_$(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT));
 WK_XPC_DOMAIN_EXTENSION_CODE_SIGN_FLAGS_YES = -o library;

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to