Title: [294072] trunk/Source/WebKit
- Revision
- 294072
- Author
- [email protected]
- Date
- 2022-05-11 14:41:42 -0700 (Wed, 11 May 2022)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (294071 => 294072)
--- trunk/Source/WebKit/ChangeLog 2022-05-11 21:37:13 UTC (rev 294071)
+++ trunk/Source/WebKit/ChangeLog 2022-05-11 21:41:42 UTC (rev 294072)
@@ -1,3 +1,17 @@
+2022-05-11 Michael Saboff <[email protected]>
+
+ 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 Per Arne Vollan <[email protected]>
[WP] Remove obsolete message filters
Modified: trunk/Source/WebKit/Configurations/BaseTarget.xcconfig (294071 => 294072)
--- trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2022-05-11 21:37:13 UTC (rev 294071)
+++ trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2022-05-11 21:41:42 UTC (rev 294072)
@@ -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: trunk/Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm (294071 => 294072)
--- trunk/Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm 2022-05-11 21:37:13 UTC (rev 294071)
+++ trunk/Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm 2022-05-11 21:41:42 UTC (rev 294072)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
