Title: [287642] trunk/Source/ThirdParty
- Revision
- 287642
- Author
- msab...@apple.com
- Date
- 2022-01-05 11:42:45 -0800 (Wed, 05 Jan 2022)
Log Message
REGRESSION (r287382): libANGLE is built into a wrong location on iOS
https://bugs.webkit.org/show_bug.cgi?id=234857
Reviewed by Saam Barati.
Reverted to the prior logic to compute INSTALL_PATH. Then added an optional prefix
for the alternate root framework location.
Source/ThirdParty/ANGLE:
* Configurations/ANGLE-dynamic.xcconfig:
Source/ThirdParty/libwebrtc:
* Configurations/libwebrtc.xcconfig:
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (287641 => 287642)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2022-01-05 19:29:43 UTC (rev 287641)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2022-01-05 19:42:45 UTC (rev 287642)
@@ -1,3 +1,15 @@
+2022-01-05 Michael Saboff <msab...@apple.com>
+
+ REGRESSION (r287382): libANGLE is built into a wrong location on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=234857
+
+ Reviewed by Saam Barati.
+
+ Reverted to the prior logic to compute INSTALL_PATH. Then added an optional prefix
+ for the alternate root framework location.
+
+ * Configurations/ANGLE-dynamic.xcconfig:
+
2021-12-22 Michael Saboff <msab...@apple.com>
Fix WebKit Build issues when using system content path
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (287641 => 287642)
--- trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2022-01-05 19:29:43 UTC (rev 287641)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2022-01-05 19:42:45 UTC (rev 287642)
@@ -14,15 +14,15 @@
ANGLE_OTHER_LDFLAGS_maccatalyst = -framework IOKit -lz;
ANGLE_OTHER_LDFLAGS_macosx = -framework IOKit -lz;
-INSTALL_PATH = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
-INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_ = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO);
-INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
-INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO[sdk=macosx*] = $(INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
+
+INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
+INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
-INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
+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);
-INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks;
+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[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));
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (287641 => 287642)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-01-05 19:29:43 UTC (rev 287641)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-01-05 19:42:45 UTC (rev 287642)
@@ -1,3 +1,15 @@
+2022-01-05 Michael Saboff <msab...@apple.com>
+
+ REGRESSION (r287382): libANGLE is built into a wrong location on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=234857
+
+ Reviewed by Saam Barati.
+
+ Reverted to the prior logic to compute INSTALL_PATH. Then added an optional prefix
+ for the alternate root framework location.
+
+ * Configurations/libwebrtc.xcconfig:
+
2021-12-22 Michael Saboff <msab...@apple.com>
Fix WebKit Build issues when using system content path
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (287641 => 287642)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2022-01-05 19:29:43 UTC (rev 287641)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2022-01-05 19:42:45 UTC (rev 287642)
@@ -31,12 +31,12 @@
EXPORTED_SYMBOLS_FILE[sdk=iphoneos*] = Configurations/libwebrtc.iOS.exp;
EXPORTED_SYMBOLS_FILE[sdk=iphonesimulator*] = Configurations/libwebrtc.iOSsim.exp;
-INSTALL_PATH = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
-INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_ = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO);
-INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
-INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO[sdk=macosx*] = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
-INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
+INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
+
+INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
+INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+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[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
