Attachment 358150 Details for Bug 193061 – Patch

[patch] Patch

bug-193061-20181231052653.patch (text/plain), 2.04 KB, created by Yusuke Suzuki on 2018-12-30 12:26:54 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Yusuke Suzuki

Created: 2018-12-30 12:26:54 PST

Size: 2.04 KB

patch

obsolete

>Subversion Revision: 239558
>diff --git a/Source/cmake/WebKitCommon.cmake b/Source/cmake/WebKitCommon.cmake
>index cafb66afa008815feb32fd7f5dd9dd9d5bed44aa..97b9f20cbbec0dd3e511d65668b53df5723d80f0 100644
>--- a/Source/cmake/WebKitCommon.cmake
>+++ b/Source/cmake/WebKitCommon.cmake
>@@ -13,9 +13,6 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
>         list(APPEND CMAKE_PROGRAM_PATH $ENV{SystemDrive}/cygwin/bin)
>     endif ()
> 
>-    # TODO Enforce version requirement for gperf
>-    find_package(Gperf 3.0.1 REQUIRED)
>-
>     # TODO Enforce version requirement for perl
>     find_package(Perl 5.10.0 REQUIRED)
>     find_package(PerlModules COMPONENTS JSON::PP REQUIRED)
>@@ -58,6 +55,13 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
>     include(OptionsCommon)
>     include(Options${PORT})
> 
>+    # Check gperf after including OptionsXXX.cmake since gperf is required only when ENABLE_WEBCORE is true,
>+    # and ENABLE_WEBCORE is configured in OptionsXXX.cmake.
>+    if (ENABLE_WEBCORE)
>+        # TODO Enforce version requirement for gperf
>+        find_package(Gperf 3.0.1 REQUIRED)
>+    endif ()
>+
>     # -----------------------------------------------------------------------------
>     # Job pool to avoid running too many memory hungry linker processes
>     # -----------------------------------------------------------------------------
>diff --git a/ChangeLog b/ChangeLog
>index 1079b98a15d104d94ac501bcab06e6477a08f0f4..347d5c9d5a96ff72f2328e8283a8bd9d9db67220 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-12-30  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
>+
>+        gperf is only used in WebCore
>+        https://bugs.webkit.org/show_bug.cgi?id=193061
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        gperf is only used in WebCore. So if the port does not have WebCore,
>+        it is not necessary. For example, JSCOnly port does not require it.
>+        This patch removes gperf dependency in these ports by checking
>+        ENABLE_WEBCORE.
>+
>+        * Source/cmake/WebKitCommon.cmake:
>+
> 2018-12-27  Alex Christensen  <achristensen@webkit.org>
> 
>         Resurrect Mac CMake build

Flags:

don.olmstead: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 193061: 358150