Attachment 339216 Details for Bug 185171 – Patch

[patch] Patch

bug-185171-20180501125056.patch (text/plain), 1.98 KB, created by Jer Noble on 2018-05-01 12:50:58 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jer Noble

Created: 2018-05-01 12:50:58 PDT

Size: 1.98 KB

patch

obsolete

>Subversion Revision: 231157
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index b45b9c8b7b0bf1893057b858c851d46fbe2c2b68..e5d9c8585c820d38bb3490301086de9f7d3bb0bf 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,12 @@
>+2018-05-01  Jer Noble  <jer.noble@apple.com>
>+
>+        Production build error in Migrate Header phase when WK_ALTERNATE_FRAMEWORKS_DIR is set to non-empty value
>+        https://bugs.webkit.org/show_bug.cgi?id=185171
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/BaseTarget.xcconfig:
>+
> 2018-04-30  Andy Estes  <aestes@apple.com>
> 
>         [iOS] Try to unlock PDF documents before printing them
>diff --git a/Source/WebKit/Configurations/BaseTarget.xcconfig b/Source/WebKit/Configurations/BaseTarget.xcconfig
>index 3285ae5af574c20157e18d27e78541cee815146f..0b91c178a8c3b9b89963227a657367ffa74e5e29 100644
>--- a/Source/WebKit/Configurations/BaseTarget.xcconfig
>+++ b/Source/WebKit/Configurations/BaseTarget.xcconfig
>@@ -81,7 +81,7 @@ UMBRELLA_FRAMEWORKS_DIR = $(UMBRELLA_FRAMEWORKS_DIR_$(CONFIGURATION));
> UMBRELLA_FRAMEWORKS_DIR_Debug = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
> UMBRELLA_FRAMEWORKS_DIR_Release = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
> UMBRELLA_FRAMEWORKS_DIR_Production = $(UMBRELLA_FRAMEWORKS_DIR_Production_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
>-UMBRELLA_FRAMEWORKS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
>+UMBRELLA_FRAMEWORKS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
> UMBRELLA_FRAMEWORKS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)$(UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
> UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
> UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);

Actions: View | Formatted Diff | Diff

Attachments on bug 185171: 339216