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 15:37:05 +0000 |
| commit | 528006009dddd876a830e0a8f248658182a37f37 (patch) | |
| tree | 0c071e5818ef82acd58113ac2d58286322f80188 | |
| parent | 2b1e9ddb10d4766cc4f8be3e55e4fc3d2810bbcb (diff) | |
| download | openembedded-core-528006009dddd876a830e0a8f248658182a37f37.tar.gz openembedded-core-528006009dddd876a830e0a8f248658182a37f37.tar.bz2 openembedded-core-528006009dddd876a830e0a8f248658182a37f37.zip | |
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)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-sato/webkit/files/cross-compile.patch | 23 | ||||
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.14.5.bb | 3 |
2 files changed, 26 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 @@ +Disable the tests meant to run when compiling natively + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: webkitgtk-2.14.5/Source/cmake/OptionsCommon.cmake +=================================================================== +--- webkitgtk-2.14.5.orig/Source/cmake/OptionsCommon.cmake ++++ webkitgtk-2.14.5/Source/cmake/OptionsCommon.cmake +@@ -67,8 +67,11 @@ endif () + # Detect Cortex-A53 core if CPU is ARM64 and OS is Linux. + # Query /proc/cpuinfo for each available core and check reported CPU part number: 0xd03 signals Cortex-A53. + # (see Main ID Register in ARM Cortex-A53 MPCore Processor Technical Reference Manual) +-set(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE OFF) +-if (WTF_CPU_ARM64 AND (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")) ++if( NOT WTF_CPU_ARM64_CORTEXA53_INITIALVALUE) ++ set(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE OFF) ++endif(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE) ++ ++if (WTF_CPU_ARM64 AND NOT CMAKE_CROSSCOMPILING AND (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")) + execute_process(COMMAND nproc OUTPUT_VARIABLE PROC_COUNT) + math(EXPR PROC_MAX ${PROC_COUNT}-1) + foreach (PROC_ID RANGE ${PROC_MAX}) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.14.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.14.5.bb index 1eb5b0b6e1..daa17a94da 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.14.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.14.5.bb @@ -20,6 +20,7 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ file://detect_atomics.patch \ file://x32_support.patch \ + file://cross-compile.patch \ " SRC_URI[md5sum] = "7fe3cb2699e64f969b285823c5ae2516" @@ -83,6 +84,8 @@ EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF " EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF " EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF " +EXTRA_OECMAKE_append_aarch64 = " -DWTF_CPU_ARM64_CORTEXA53=ON" + # JIT not supported on MIPS either EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF " |