summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorManjukumar Matha <manjukumar.harthikote-matha@xilinx.com>2018-02-15 19:26:30 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-27 15:51:03 +0000
commitb138d655df567d98497bf3743ac0fecb9f231db5 (patch)
treee965c14a8a022d711f4c9511e63105170fbce379 /meta
parent75722f462e40cb014aff79ee9edce0b2cddfa972 (diff)
downloadpoky-b138d655df567d98497bf3743ac0fecb9f231db5.tar.gz
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) (From OE-Core rev: 86b38c9b1def872a5bbabb842e33a12eb83b275c) (From OE-Core rev: 6fa5293e6628ab0bb93da1c6e622194286c9d957) Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch29
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.18.6.bb1
2 files changed, 30 insertions, 0 deletions
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 @@
1Fix configure failure for aarch64
2
3| -- Performing Test CXX_COMPILER_SUPPORTS_-fcolor-diagnostics - Failed
4| -- Performing Test CXX_COMPILER_SUPPORTS_-fdiagnostics-color=always
5| -- Performing Test CXX_COMPILER_SUPPORTS_-fdiagnostics-color=always - Success
6| CMake Error at Source/cmake/OptionsCommon.cmake:42 (WEBKIT_PREPEND_GLOBAL_COMPILER_FLAG):
7| Unknown CMake command "WEBKIT_PREPEND_GLOBAL_COMPILER_FLAG".
8| Call Stack (most recent call first):
9| Source/cmake/WebKitCommon.cmake:58 (include)
10| CMakeLists.txt:166 (include)
11|
12
13Upstream-Status: Pending
14
15Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
16
17Index: webkitgtk-2.14.6/Source/cmake/OptionsCommon.cmake
18===================================================================
19--- webkitgtk-2.14.6.orig/Source/cmake/OptionsCommon.cmake 2018-02-15 18:56:29.315238564 -0800
20+++ webkitgtk-2.14.6/Source/cmake/OptionsCommon.cmake 2018-02-15 18:54:57.469518064 -0800
21@@ -39,7 +39,7 @@
22 if (NOT WTF_CPU_ARM64)
23 message(FATAL_ERROR "WTF_CPU_ARM64_CORTEXA53 set without WTF_CPU_ARM64")
24 endif ()
25- WEBKIT_PREPEND_GLOBAL_COMPILER_FLAG(-mfix-cortex-a53-835769)
26+ WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-mfix-cortex-a53-835769)
27 endif ()
28
29 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 \
20 file://detect-atomics-during-configure.patch \ 20 file://detect-atomics-during-configure.patch \
21 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ 21 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
22 file://0001-Fix-build-with-musl.patch \ 22 file://0001-Fix-build-with-musl.patch \
23 file://fix-configure-failure-aarch64.patch \
23 " 24 "
24 25
25SRC_URI[md5sum] = "c1a548595135ee75ad3bf2e18ac83112" 26SRC_URI[md5sum] = "c1a548595135ee75ad3bf2e18ac83112"