diff options
| author | Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> | 2018-02-15 19:26:30 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-24 10:31:45 +0000 |
| commit | f9c90755eb7ffc5ce8b87a2fd1b9c05522ffe7d9 (patch) | |
| tree | 8337699908a7e2994fc1fce136bb1c823e62b079 | |
| parent | a63b504f9b7c2a4dbf57637542779e65ad4c1afe (diff) | |
| download | poky-f9c90755eb7ffc5ce8b87a2fd1b9c05522ffe7d9.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)
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>
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch | 29 | ||||
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.18.6.bb | 1 |
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 @@ | |||
| 1 | Fix 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 | |||
| 13 | Upstream-Status: Pending | ||
| 14 | |||
| 15 | Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> | ||
| 16 | |||
| 17 | Index: 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 | ||
| 25 | SRC_URI[md5sum] = "c1a548595135ee75ad3bf2e18ac83112" | 26 | SRC_URI[md5sum] = "c1a548595135ee75ad3bf2e18ac83112" |
