Attachment 347951 Details for Bug 188901 – Patch

[patch] Patch

bug-188901.diff (text/plain), 3.01 KB, created by Don Olmstead on 2018-08-23 14:10:35 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2018-08-23 14:10:35 PDT

Size: 3.01 KB

patch

obsolete

>diff --git a/ChangeLog b/ChangeLog
>index daf1c1a7fae..60cdc35c811 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-08-23  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Have checks are not getting set inside CMake properly
>+        https://bugs.webkit.org/show_bug.cgi?id=188901
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Make sure the variable's value is sent to SET_AND_EXPOSE_TO_BUILD
>+        within the WEBKIT_CHECK_HAVE_* macros.
>+
>+        * Source/cmake/WebKitFeatures.cmake:
>+
> 2018-08-23  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake] Add HAVE_MALLOC_TRIM definition
>diff --git a/PerformanceTests/CMakeLists.txt b/PerformanceTests/CMakeLists.txt
>index 0657f47968d..4322d2ad892 100644
>--- a/PerformanceTests/CMakeLists.txt
>+++ b/PerformanceTests/CMakeLists.txt
>@@ -1,6 +1,8 @@
> # MallocBench requires malloc_trim for non-Apple platforms
> if (NOT USE_SYSTEM_MALLOC AND (APPLE OR HAVE_MALLOC_TRIM))
>     add_subdirectory(MallocBench)
>+else ()
>+    message(WARNING "MallocBench is not available on this platform")
> endif ()
> 
> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
>diff --git a/PerformanceTests/ChangeLog b/PerformanceTests/ChangeLog
>index 80391f80aad..21624915cc4 100644
>--- a/PerformanceTests/ChangeLog
>+++ b/PerformanceTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-08-23  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Have checks are not getting set inside CMake properly
>+        https://bugs.webkit.org/show_bug.cgi?id=188901
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add notification that MallocBench is disabled.
>+
>+        * CMakeLists.txt:
>+
> 2018-08-23  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake] Add HAVE_MALLOC_TRIM definition
>diff --git a/Source/cmake/WebKitFeatures.cmake b/Source/cmake/WebKitFeatures.cmake
>index e15b6fe1e9d..55fdbd30a15 100644
>--- a/Source/cmake/WebKitFeatures.cmake
>+++ b/Source/cmake/WebKitFeatures.cmake
>@@ -362,22 +362,22 @@ endmacro()
> 
> macro(WEBKIT_CHECK_HAVE_INCLUDE _variable _header)
>     check_include_file(${_header} ${_variable}_value)
>-    SET_AND_EXPOSE_TO_BUILD(${_variable} ${_variable}_value)
>+    SET_AND_EXPOSE_TO_BUILD(${_variable} ${${_variable}_value})
> endmacro()
> 
> macro(WEBKIT_CHECK_HAVE_FUNCTION _variable _function)
>     check_function_exists(${_function} ${_variable}_value)
>-    SET_AND_EXPOSE_TO_BUILD(${_variable} ${_variable}_value)
>+    SET_AND_EXPOSE_TO_BUILD(${_variable} ${${_variable}_value})
> endmacro()
> 
> macro(WEBKIT_CHECK_HAVE_SYMBOL _variable _symbol _header)
>     check_symbol_exists(${_symbol} ${_header} ${_variable}_value)
>-    SET_AND_EXPOSE_TO_BUILD(${_variable} ${_variable}_value)
>+    SET_AND_EXPOSE_TO_BUILD(${_variable} ${${_variable}_value})
> endmacro()
> 
> macro(WEBKIT_CHECK_HAVE_STRUCT _variable _struct _member _header)
>     check_struct_has_member(${_struct} ${_member} ${_header} ${_variable}_value)
>-    SET_AND_EXPOSE_TO_BUILD(${_variable} ${_variable}_value)
>+    SET_AND_EXPOSE_TO_BUILD(${_variable} ${${_variable}_value})
> endmacro()
> 
> option(ENABLE_EXPERIMENTAL_FEATURES "Enable experimental features" OFF)

Actions: View | Formatted Diff | Diff

Attachments on bug 188901: 347951