Attachment 338791 Details for Bug 184999 – Patch

[patch] Patch

bug-184999-20180425142113.patch (text/plain), 2.06 KB, created by Wenson Hsieh on 2018-04-25 14:21:13 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Wenson Hsieh

Created: 2018-04-25 14:21:13 PDT

Size: 2.06 KB

patch

obsolete

>Subversion Revision: 231017
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 122bbcd84a5f8265e7866e6b797c87e60d5fec8f..af8c0a1b38752eae1e1afdae7d9cfa8c7538c7be 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-04-25  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        Missing closing parenthesis when determining INSTALL_PATH build setting in WebCore.xcconfig
>+        https://bugs.webkit.org/show_bug.cgi?id=184999
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Tweaks a line in WebCore.xcconfig that computes INSTALL_PATH, so that it doesn't use WK_NOT or WK_EMPTY.
>+
>+        * Configurations/WebCore.xcconfig:
>+
> 2018-04-25  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] Implement Layout::BlockContainer functions.
>diff --git a/Source/WebCore/Configurations/WebCore.xcconfig b/Source/WebCore/Configurations/WebCore.xcconfig
>index bb1524d9b79bf10471e31beb58dae81fe6bd7282..6e6a2441ac2d3a18c4f1f86b0e6bc70afd796d74 100644
>--- a/Source/WebCore/Configurations/WebCore.xcconfig
>+++ b/Source/WebCore/Configurations/WebCore.xcconfig
>@@ -50,9 +50,9 @@ LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc $
> HEADER_SEARCH_PATHS = PAL ForwardingHeaders /usr/include/libxslt /usr/include/libxml2 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS) $(SRCROOT);
> INFOPLIST_FILE = Info.plist;
> 
>-INSTALL_PATH = $(INSTALL_PATH_COCOA_TOUCH_$(WK_NOT_$(WK_EMPTY_$(WK_COCOA_TOUCH)));
>-INSTALL_PATH_COCOA_TOUCH_YES = $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
>-INSTALL_PATH_COCOA_TOUCH_NO = $(WEBCORE_FRAMEWORKS_DIR);
>+INSTALL_PATH = $(INSTALL_PATH_$(WK_COCOA_TOUCH));
>+INSTALL_PATH_cocoatouch = $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
>+INSTALL_PATH_ = $(WEBCORE_FRAMEWORKS_DIR);
> 
> DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_PLATFORM);
> DYLIB_INSTALL_NAME_BASE_PLATFORM[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;

Actions: View | Formatted Diff | Diff

Attachments on bug 184999: 338784 | 338791