diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-03-16 11:22:43 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-17 16:53:05 +0000 |
commit | 17e7ff4be94ee6179208548e55f88c2568676d51 (patch) | |
tree | e13a4e43007d28dd251a4675b577668e4e11fdae /meta/recipes-sato/webkit/files | |
parent | ed602b58ed4d2f059e159b5898c788557e435d22 (diff) | |
download | poky-17e7ff4be94ee6179208548e55f88c2568676d51.tar.gz |
webkitgtk: Fix build on aarch64
Do not try to do runtime tests during cross compile
Fixes
| CMake Error at Source/cmake/OptionsCommon.cmake:73 (math):
| math cannot parse the expression: "-1": syntax error, unexpected exp_MINUS,
| expecting exp_OPENPARENT or exp_NUMBER (1)
(From OE-Core rev: 528006009dddd876a830e0a8f248658182a37f37)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit/files')
-rw-r--r-- | meta/recipes-sato/webkit/files/cross-compile.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/files/cross-compile.patch b/meta/recipes-sato/webkit/files/cross-compile.patch new file mode 100644 index 0000000000..4d1de72851 --- /dev/null +++ b/meta/recipes-sato/webkit/files/cross-compile.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Disable the tests meant to run when compiling natively | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
5 | |||
6 | Index: webkitgtk-2.14.5/Source/cmake/OptionsCommon.cmake | ||
7 | =================================================================== | ||
8 | --- webkitgtk-2.14.5.orig/Source/cmake/OptionsCommon.cmake | ||
9 | +++ webkitgtk-2.14.5/Source/cmake/OptionsCommon.cmake | ||
10 | @@ -67,8 +67,11 @@ endif () | ||
11 | # Detect Cortex-A53 core if CPU is ARM64 and OS is Linux. | ||
12 | # Query /proc/cpuinfo for each available core and check reported CPU part number: 0xd03 signals Cortex-A53. | ||
13 | # (see Main ID Register in ARM Cortex-A53 MPCore Processor Technical Reference Manual) | ||
14 | -set(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE OFF) | ||
15 | -if (WTF_CPU_ARM64 AND (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")) | ||
16 | +if( NOT WTF_CPU_ARM64_CORTEXA53_INITIALVALUE) | ||
17 | + set(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE OFF) | ||
18 | +endif(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE) | ||
19 | + | ||
20 | +if (WTF_CPU_ARM64 AND NOT CMAKE_CROSSCOMPILING AND (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")) | ||
21 | execute_process(COMMAND nproc OUTPUT_VARIABLE PROC_COUNT) | ||
22 | math(EXPR PROC_MAX ${PROC_COUNT}-1) | ||
23 | foreach (PROC_ID RANGE ${PROC_MAX}) | ||