diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-04-02 05:23:53 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-04-04 16:38:59 +0300 |
| commit | 001113296d3300ffaf6b6d1578a4232dbf2695c8 (patch) | |
| tree | 14ddda5f75227063a7dea14becfecda14e67c500 /import-layers/yocto-poky/meta/recipes-sato | |
| parent | 211ccf33fb57ddede03d26cf7cb05924d039b2df (diff) | |
| download | openbmc-001113296d3300ffaf6b6d1578a4232dbf2695c8.tar.xz | |
Rocko refresh
poky: 0ec241873367e18f5371a3ad9aca1e2801dcd4ee
meta-openembbeded: dacfa2b1920e285531bec55cd2f08743390aaf57
meta-virtualization: bd77388f31929f38e7d4cc9c711f0f83f563007e
meta-raspberrypi: b58ccfc696e4fa6b680ae5ca79960312676d7af9
Tested: Built witherspoon, palmetto and qemu images
Change-Id: I934ff48674042bb5ce6b7d75642e7adb9668a409
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-sato')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch | 29 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch b/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch new file mode 100644 index 000000000..4a6ab544b --- /dev/null +++ b/import-layers/yocto-poky/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 <manjukumar.harthikote-matha@xilinx.com> + +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/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb b/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb index ff0ff8fce..9fac04444 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb +++ b/import-layers/yocto-poky/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" |