From 86b38c9b1def872a5bbabb842e33a12eb83b275c Mon Sep 17 00:00:00 2001 From: Manjukumar Matha Date: Thu, 15 Feb 2018 19:26:30 -0800 Subject: webkitgtk_2.18.6.bb: Fix configure failure for aarch64 build Fix configure failure for aarch64 | -- Performing Test CXX_COMPILER_SUPPORTS_-fcolor-diagnostics - Failed | -- Performing Test CXX_COMPILER_SUPPORTS_-fdiagnostics-color=always | -- Performing Test CXX_COMPILER_SUPPORTS_-fdiagnostics-color=always -Success | CMake Error at Source/cmake/OptionsCommon.cmake:42 (WEBKIT_PREPEND_GLOBAL_COMPILER_FLAG): | Unknown CMake command "WEBKIT_PREPEND_GLOBAL_COMPILER_FLAG". | Call Stack (most recent call first): | Source/cmake/WebKitCommon.cmake:58 (include) | CMakeLists.txt:166 (include) Signed-off-by: Manjukumar Matha Signed-off-by: Ross Burton --- .../webkitgtk/fix-configure-failure-aarch64.patch | 29 ++++++++++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.18.6.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch (limited to 'meta/recipes-sato') diff --git a/meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch b/meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch new file mode 100644 index 0000000000..4a6ab544b2 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch @@ -0,0 +1,29 @@ +Fix configure failure for aarch64 + +| -- Performing Test CXX_COMPILER_SUPPORTS_-fcolor-diagnostics - Failed +| -- Performing Test CXX_COMPILER_SUPPORTS_-fdiagnostics-color=always +| -- Performing Test CXX_COMPILER_SUPPORTS_-fdiagnostics-color=always - Success +| CMake Error at Source/cmake/OptionsCommon.cmake:42 (WEBKIT_PREPEND_GLOBAL_COMPILER_FLAG): +| Unknown CMake command "WEBKIT_PREPEND_GLOBAL_COMPILER_FLAG". +| Call Stack (most recent call first): +| Source/cmake/WebKitCommon.cmake:58 (include) +| CMakeLists.txt:166 (include) +| + +Upstream-Status: Pending + +Signed-off-by: Manjukumar Matha + +Index: webkitgtk-2.14.6/Source/cmake/OptionsCommon.cmake +=================================================================== +--- webkitgtk-2.14.6.orig/Source/cmake/OptionsCommon.cmake 2018-02-15 18:56:29.315238564 -0800 ++++ webkitgtk-2.14.6/Source/cmake/OptionsCommon.cmake 2018-02-15 18:54:57.469518064 -0800 +@@ -39,7 +39,7 @@ + if (NOT WTF_CPU_ARM64) + message(FATAL_ERROR "WTF_CPU_ARM64_CORTEXA53 set without WTF_CPU_ARM64") + endif () +- WEBKIT_PREPEND_GLOBAL_COMPILER_FLAG(-mfix-cortex-a53-835769) ++ WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-mfix-cortex-a53-835769) + endif () + + EXPOSE_VARIABLE_TO_BUILD(WTF_CPU_ARM64_CORTEXA53) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb b/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb index ff0ff8fce9..9fac044441 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb @@ -20,6 +20,7 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://detect-atomics-during-configure.patch \ file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ file://0001-Fix-build-with-musl.patch \ + file://fix-configure-failure-aarch64.patch \ " SRC_URI[md5sum] = "c1a548595135ee75ad3bf2e18ac83112" -- cgit 1.2.3-korg