diff options
author | Khem Raj <raj.khem@gmail.com> | 2016-05-11 10:35:11 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-13 13:41:29 +0100 |
commit | 268f66fe0e2eddf543fda26c50ef3123c5ef6b1a (patch) | |
tree | 791ff3196c09213f040f7112ae215b3ed7894797 /meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch | |
parent | b5c1f588320e6b1f1804803de9abc0bf71976f3e (diff) | |
download | poky-268f66fe0e2eddf543fda26c50ef3123c5ef6b1a.tar.gz |
webkitgtk: Upgrade to 2.12.1
Fix build with gcc-6
Do not tinker with -isystem, this causes issues
where gcc does not find standard C++ headers since
the default search ordered for system headers is
changed and is not correct anymore. Errorr like
WebCore/editing/gtk/EditorGtk.cpp:27:
/mnt/oe/poky/build/tmp/sysroots/qemuarm/usr/include/c++/6.0.1/cstdlib:75:25: fatal error: stdlib.h: No such file or directory
#include_next <stdlib.h>
It brings a patch to fix typename mismatch
for pow()
see
https://bugs.webkit.org/show_bug.cgi?id=153071
Drop upstreamed patches
User -fPIC on aarch64 to fix
relocation truncated to fit: R_AARCH64_LD64_GOTPAGE_LO15 against symbol `__stack_chk_guard@@GLIBC_2.17' defined in .data.rel.ro section
(From OE-Core rev: 0a6e162c47017ecf51b466218fb549e0e199f4c4)
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/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch')
-rw-r--r-- | meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch b/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch index 44b43cdbba..3f71297f50 100644 --- a/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch +++ b/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch | |||
@@ -13,28 +13,25 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
13 | Source/WebKit2/PlatformGTK.cmake | 4 ++-- | 13 | Source/WebKit2/PlatformGTK.cmake | 4 ++-- |
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | 14 | 1 file changed, 2 insertions(+), 2 deletions(-) |
15 | 15 | ||
16 | diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake | 16 | Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake |
17 | index 706f1e8..14a1c3b 100644 | 17 | =================================================================== |
18 | --- a/Source/WebKit2/PlatformGTK.cmake | 18 | --- webkitgtk-2.12.1.orig/Source/WebKit2/PlatformGTK.cmake |
19 | +++ b/Source/WebKit2/PlatformGTK.cmake | 19 | +++ webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake |
20 | @@ -884,7 +884,7 @@ add_custom_command( | 20 | @@ -910,7 +910,7 @@ add_custom_command( |
21 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | 21 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir |
22 | DEPENDS WebKit2 | 22 | DEPENDS WebKit2 |
23 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | 23 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir |
24 | - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS= | 24 | - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS= |
25 | + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= | 25 | + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= |
26 | LD_LIBRARY_PATH="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | 26 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" |
27 | ${INTROSPECTION_SCANNER} | 27 | ${INTROSPECTION_SCANNER} |
28 | --quiet | 28 | --quiet |
29 | @@ -930,7 +930,7 @@ add_custom_command( | 29 | @@ -951,7 +951,7 @@ add_custom_command( |
30 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir | 30 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir |
31 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | 31 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir |
32 | DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | 32 | DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir |
33 | - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations | 33 | - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations |
34 | + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} | 34 | + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} |
35 | LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" | 35 | LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" |
36 | LD_LIBRARY_PATH="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | 36 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" |
37 | ${INTROSPECTION_SCANNER} | 37 | ${INTROSPECTION_SCANNER} |
38 | -- | ||
39 | 2.6.4 | ||
40 | |||