Attachment 346122 Details for Bug 188180 – Patch

[patch] Patch

bug-188180-20180730163432.patch (text/plain), 2.03 KB, created by Wenson Hsieh on 2018-07-30 16:34:33 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Wenson Hsieh

Created: 2018-07-30 16:34:33 PDT

Size: 2.03 KB

patch

obsolete

>Subversion Revision: 234384
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 55c98f2fe4c809329ab74839ec091fb9322686a5..63b6edaf37a81619de26793c7d1f4a2b25d7b39d 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-07-30  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        watchOS engineering build is broken after r234227
>+        https://bugs.webkit.org/show_bug.cgi?id=188180
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        In the case where we're building with a `PLATFORM_NAME` of neither "macosx" nor "iphone*",
>+        postprocess-headers.sh attempts to delete any usage of the JSC availability macros. However,
>+        `JSC_MAC_VERSION_TBA` and `JSC_IOS_VERSION_TBA` still remain, and JSValue.h's usage of
>+        `JSC_IOS_VERSION_TBA` causes engineering watchOS builds to fail.
>+
>+        To fix this, simply allow the fallback path to remove these macros from JavaScriptCore headers
>+        entirely, since there's no relevant version to replace them with.
>+
>+        * postprocess-headers.sh:
>+
> 2018-07-30  Keith Miller  <keith_miller@apple.com>
> 
>         Clarify conversion rules for JSValue property access API
>diff --git a/Source/JavaScriptCore/postprocess-headers.sh b/Source/JavaScriptCore/postprocess-headers.sh
>index fcde8a13711a4bbd11c8a0a2130f6c1227a171f8..fd28836dc8bdf1e5f4939f42599a1c07f4f9bfc9 100755
>--- a/Source/JavaScriptCore/postprocess-headers.sh
>+++ b/Source/JavaScriptCore/postprocess-headers.sh
>@@ -76,7 +76,11 @@ function rewrite_headers () {
>             -e "s/^JSC_CLASS_DEPRECATED/JSC_EXTERN API_DEPRECATED/"
>         )
>     else
>-        SED_OPTIONS+=(-e 's/JSC_(API_|CLASS_)AVAILABLE$.*$\s*\)//g' -e 's/JSC_(API_|CLASS_)DEPRECATED(_WITH_REPLACEMENT)?$.*$\s*\)//g')
>+        SED_OPTIONS+=(
>+            -e 's/JSC_(API_|CLASS_)AVAILABLE$.*$\s*\)//g'
>+            -e 's/JSC_(API_|CLASS_)DEPRECATED(_WITH_REPLACEMENT)?$.*$\s*\)//g'
>+            -e 's/JSC_(MAC|IOS)_VERSION_TBA/0/g'
>+        )
>     fi
> 
>     SED_OPTIONS+=(${OTHER_SED_OPTIONS[*]})

Actions: View | Formatted Diff | Diff

Attachments on bug 188180: 346122