Title: [288919] branches/safari-613.1.14.5-branch/Source/WebKit
- Revision
- 288919
- Author
- [email protected]
- Date
- 2022-02-01 15:59:49 -0800 (Tue, 01 Feb 2022)
Log Message
Cherry-pick r288917. rdar://problem/88334496
Catalyst builds of WebKit with system content path put XPCServices and Daemons in the normal location
https://bugs.webkit.org/show_bug.cgi?id=235976
Reviewed by Mark Lam.
The production of WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES used the system framework path
instead of using the computed value of NORMAL_WEBKIT_FRAMEWORKS_DIR which includes the Catalyst prefix.
* Configurations/BaseTarget.xcconfig:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288917 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613.1.14.5-branch/Source/WebKit/ChangeLog (288918 => 288919)
--- branches/safari-613.1.14.5-branch/Source/WebKit/ChangeLog 2022-02-01 23:58:41 UTC (rev 288918)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/ChangeLog 2022-02-01 23:59:49 UTC (rev 288919)
@@ -1,3 +1,32 @@
+2022-02-01 Russell Epstein <[email protected]>
+
+ Cherry-pick r288917. rdar://problem/88334496
+
+ Catalyst builds of WebKit with system content path put XPCServices and Daemons in the normal location
+ https://bugs.webkit.org/show_bug.cgi?id=235976
+
+ Reviewed by Mark Lam.
+
+ The production of WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES used the system framework path
+ instead of using the computed value of NORMAL_WEBKIT_FRAMEWORKS_DIR which includes the Catalyst prefix.
+
+ * Configurations/BaseTarget.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288917 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-02-01 Michael Saboff <[email protected]>
+
+ Catalyst builds of WebKit with system content path put XPCServices and Daemons in the normal location
+ https://bugs.webkit.org/show_bug.cgi?id=235976
+
+ Reviewed by Mark Lam.
+
+ The production of WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES used the system framework path
+ instead of using the computed value of NORMAL_WEBKIT_FRAMEWORKS_DIR which includes the Catalyst prefix.
+
+ * Configurations/BaseTarget.xcconfig:
+
2022-01-28 Russell Epstein <[email protected]>
Cherry-pick r288749. rdar://problem/87928380
Modified: branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/BaseTarget.xcconfig (288918 => 288919)
--- branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/BaseTarget.xcconfig 2022-02-01 23:58:41 UTC (rev 288918)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/BaseTarget.xcconfig 2022-02-01 23:59:49 UTC (rev 288919)
@@ -67,7 +67,7 @@
NORMAL_WEBKIT_FRAMEWORKS_DIR = $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/Frameworks;
WEBKIT_FRAMEWORKS_DIR = $(WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/Frameworks;
+WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBKIT_FRAMEWORKS_DIR);
WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_ = $(WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_NO);
WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_NO = $(WEBKIT_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
WEBKIT_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
