Title: [291707] branches/safari-614.1.5-branch/Source
- Revision
- 291707
- Author
- repst...@apple.com
- Date
- 2022-03-22 14:51:44 -0700 (Tue, 22 Mar 2022)
Log Message
Revert r291458. rdar://problem/90655518
Modified Paths
Diff
Modified: branches/safari-614.1.5-branch/Source/ThirdParty/ANGLE/ChangeLog (291706 => 291707)
--- branches/safari-614.1.5-branch/Source/ThirdParty/ANGLE/ChangeLog 2022-03-22 21:50:03 UTC (rev 291706)
+++ branches/safari-614.1.5-branch/Source/ThirdParty/ANGLE/ChangeLog 2022-03-22 21:51:44 UTC (rev 291707)
@@ -1,3 +1,7 @@
+2022-03-22 Russell Epstein <repst...@apple.com>
+
+ Revert r291458. rdar://problem/90655518
+
2022-03-17 Russell Epstein <repst...@apple.com>
Cherry-pick r291455. rdar://problem/90449608
Modified: branches/safari-614.1.5-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (291706 => 291707)
--- branches/safari-614.1.5-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2022-03-22 21:50:03 UTC (rev 291706)
+++ branches/safari-614.1.5-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2022-03-22 21:51:44 UTC (rev 291707)
@@ -30,7 +30,6 @@
INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(INSTALL_PATH_PREFIX)$(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks;
-DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
DYLIB_INSTALL_NAME_BASE_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_$(WK_RELOCATABLE_FRAMEWORKS));
DYLIB_INSTALL_NAME_BASE_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks;
Modified: branches/safari-614.1.5-branch/Source/ThirdParty/libwebrtc/ChangeLog (291706 => 291707)
--- branches/safari-614.1.5-branch/Source/ThirdParty/libwebrtc/ChangeLog 2022-03-22 21:50:03 UTC (rev 291706)
+++ branches/safari-614.1.5-branch/Source/ThirdParty/libwebrtc/ChangeLog 2022-03-22 21:51:44 UTC (rev 291707)
@@ -1,3 +1,7 @@
+2022-03-22 Russell Epstein <repst...@apple.com>
+
+ Revert r291458. rdar://problem/90655518
+
2022-03-17 Russell Epstein <repst...@apple.com>
Cherry-pick r291455. rdar://problem/90449608
Modified: branches/safari-614.1.5-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (291706 => 291707)
--- branches/safari-614.1.5-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2022-03-22 21:50:03 UTC (rev 291706)
+++ branches/safari-614.1.5-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2022-03-22 21:51:44 UTC (rev 291707)
@@ -45,7 +45,6 @@
INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(INSTALL_PATH_PREFIX)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
-DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_$(WK_RELOCATABLE_FRAMEWORKS));
DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(DYLIB_INSTALL_NAME_BASE);
Modified: branches/safari-614.1.5-branch/Source/WebGPU/ChangeLog (291706 => 291707)
--- branches/safari-614.1.5-branch/Source/WebGPU/ChangeLog 2022-03-22 21:50:03 UTC (rev 291706)
+++ branches/safari-614.1.5-branch/Source/WebGPU/ChangeLog 2022-03-22 21:51:44 UTC (rev 291707)
@@ -1,3 +1,7 @@
+2022-03-22 Russell Epstein <repst...@apple.com>
+
+ Revert r291458. rdar://problem/90655518
+
2022-03-17 Russell Epstein <repst...@apple.com>
Cherry-pick r291455. rdar://problem/90449608
Modified: branches/safari-614.1.5-branch/Source/WebGPU/Configurations/WebGPU.xcconfig (291706 => 291707)
--- branches/safari-614.1.5-branch/Source/WebGPU/Configurations/WebGPU.xcconfig 2022-03-22 21:50:03 UTC (rev 291706)
+++ branches/safari-614.1.5-branch/Source/WebGPU/Configurations/WebGPU.xcconfig 2022-03-22 21:51:44 UTC (rev 291707)
@@ -39,7 +39,7 @@
DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
DYLIB_INSTALL_NAME_BASE_NO = $(NORMAL_WEBGPU_FRAMEWORKS_DIR);
-DYLIB_INSTALL_NAME_BASE_YES = $(WEBGPU_FRAMEWORKS_DIR);
+DYLIB_INSTALL_NAME_BASE_YES = $(DYLIB_INSTALL_NAME_BASE);
ALTERNATE_ROOT_PATH = $(WEBGPU_FRAMEWORKS_DIR);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
