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:40:51 +0100 |
| commit | 0a6e162c47017ecf51b466218fb549e0e199f4c4 (patch) | |
| tree | 0184016eda7e238bb8e43fd2212e9369d3136ea4 /meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch | |
| parent | aaab0e290ec7c4fb09a46a15d72d6aec6dedc832 (diff) | |
| download | openembedded-core-0a6e162c47017ecf51b466218fb549e0e199f4c4.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
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-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch')
| -rw-r--r-- | meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch b/meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch index 3d004db29c..93a69c0292 100644 --- a/meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch +++ b/meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch @@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Source/cmake/OptionsGTK.cmake | 6 ------ 1 file changed, 6 deletions(-) -diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index e5f1f5b..4698036 100644 ---- a/Source/cmake/OptionsGTK.cmake -+++ b/Source/cmake/OptionsGTK.cmake -@@ -443,12 +443,6 @@ if (USE_LIBHYPHEN) +Index: webkitgtk-2.12.1/Source/cmake/OptionsGTK.cmake +=================================================================== +--- webkitgtk-2.12.1.orig/Source/cmake/OptionsGTK.cmake ++++ webkitgtk-2.12.1/Source/cmake/OptionsGTK.cmake +@@ -424,12 +424,6 @@ if (USE_LIBHYPHEN) endif () endif () @@ -27,9 +27,6 @@ index e5f1f5b..4698036 100644 - set(ENABLE_INTROSPECTION OFF) -endif () - - set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom) - set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk) - set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit) --- -2.7.0 - + # Override the cached variable, gtk-doc does not really work when building on Mac. + if (APPLE) + set(ENABLE_GTKDOC OFF) |