Title: [294106] branches/safari-7614.1.13-branch/Source/WebKit
- Revision
- 294106
- Author
- repst...@apple.com
- Date
- 2022-05-12 10:37:47 -0700 (Thu, 12 May 2022)
Log Message
Cherry-pick r294072. rdar://problem/93058432
Need to add DYLD_LIBRARY_PATH for XPC services
https://bugs.webkit.org/show_bug.cgi?id=240289
Reviewed by Alexey Proskuryakov.
Set DYLD_LIBRARY_PATH / DYLD_VERSIONED_LIBRARY_PATH for XPC services depending on the value of USE_STAGING_INSTALL_PATH.
Also added DYLD_LIBRARY_PATH to the XPC environment for webpushd.
* Configurations/BaseTarget.xcconfig:
* webpushd/webpushtool/WebPushToolMain.mm:
(registerDaemonWithLaunchD):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@294072 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog (294105 => 294106)
--- branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog 2022-05-12 17:31:22 UTC (rev 294105)
+++ branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog 2022-05-12 17:37:47 UTC (rev 294106)
@@ -1,3 +1,36 @@
+2022-05-12 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r294072. rdar://problem/93058432
+
+ Need to add DYLD_LIBRARY_PATH for XPC services
+ https://bugs.webkit.org/show_bug.cgi?id=240289
+
+ Reviewed by Alexey Proskuryakov.
+
+ Set DYLD_LIBRARY_PATH / DYLD_VERSIONED_LIBRARY_PATH for XPC services depending on the value of USE_STAGING_INSTALL_PATH.
+ Also added DYLD_LIBRARY_PATH to the XPC environment for webpushd.
+
+ * Configurations/BaseTarget.xcconfig:
+ * webpushd/webpushtool/WebPushToolMain.mm:
+ (registerDaemonWithLaunchD):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@294072 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-05-11 Michael Saboff <msab...@apple.com>
+
+ Need to add DYLD_LIBRARY_PATH for XPC services
+ https://bugs.webkit.org/show_bug.cgi?id=240289
+
+ Reviewed by Alexey Proskuryakov.
+
+ Set DYLD_LIBRARY_PATH / DYLD_VERSIONED_LIBRARY_PATH for XPC services depending on the value of USE_STAGING_INSTALL_PATH.
+ Also added DYLD_LIBRARY_PATH to the XPC environment for webpushd.
+
+ * Configurations/BaseTarget.xcconfig:
+ * webpushd/webpushtool/WebPushToolMain.mm:
+ (registerDaemonWithLaunchD):
+
2022-05-11 Russell Epstein <repst...@apple.com>
Cherry-pick r293945. rdar://problem/92859012
Modified: branches/safari-7614.1.13-branch/Source/WebKit/Configurations/BaseTarget.xcconfig (294105 => 294106)
--- branches/safari-7614.1.13-branch/Source/WebKit/Configurations/BaseTarget.xcconfig 2022-05-12 17:31:22 UTC (rev 294105)
+++ branches/safari-7614.1.13-branch/Source/WebKit/Configurations/BaseTarget.xcconfig 2022-05-12 17:37:47 UTC (rev 294106)
@@ -125,8 +125,8 @@
WEBKIT_LEGACY_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebKitLegacy.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders;
OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH = $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_$(USE_STAGING_INSTALL_PATH));
-OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES = -Wl,-dyld_env,DYLD_VERSIONED_FRAMEWORK_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari;
-OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES[arch=arm64*][sdk=macosx11*] = -Wl,-dyld_env,DYLD_FRAMEWORK_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari;
+OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES = -Wl,-dyld_env,DYLD_VERSIONED_FRAMEWORK_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari,-dyld_env,DYLD_VERSIONED_LIBRARY_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari;
+OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES[arch=arm64*][sdk=macosx11*] = -Wl,-dyld_env,DYLD_FRAMEWORK_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari,-dyld_env,DYLD_LIBRARY_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari;
WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
Modified: branches/safari-7614.1.13-branch/Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm (294105 => 294106)
--- branches/safari-7614.1.13-branch/Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm 2022-05-12 17:31:22 UTC (rev 294105)
+++ branches/safari-7614.1.13-branch/Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm 2022-05-12 17:37:47 UTC (rev 294106)
@@ -106,6 +106,7 @@
{
auto environmentVariables = adoptNS(xpc_dictionary_create(nullptr, nullptr, 0));
xpc_dictionary_set_string(environmentVariables.get(), "DYLD_FRAMEWORK_PATH", currentExecutableDirectoryURL.fileSystemRepresentation);
+ xpc_dictionary_set_string(environmentVariables.get(), "DYLD_LIBRARY_PATH", currentExecutableDirectoryURL.fileSystemRepresentation);
xpc_dictionary_set_value(plist.get(), "EnvironmentVariables", environmentVariables.get());
}
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
