summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-06-14 12:34:11 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-23 11:44:14 +0100
commitd2e23d3d02a1623e44dc545ff2407c68db7686fc (patch)
treecb040626fe8c2259f0de4b16d626a1d84e63f9f4 /meta
parent9feef47544603894fca04c51fff7506218370ff5 (diff)
downloadpoky-d2e23d3d02a1623e44dc545ff2407c68db7686fc.tar.gz
webkitgtk: Upgrade to 2.16.3
Use bfd linker on ppc, this is because gold fails to link webkit libraries when PIE is enabled (From OE-Core rev: 8808d4b13a946499bc6e84a1be15f53d8ab3f673) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch12
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.16.3.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.16.1.bb)5
2 files changed, 9 insertions, 8 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch b/meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch
index 5f58e4953e..a1ad248aac 100644
--- a/meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch
@@ -11,16 +11,16 @@ Upstream-Status: Pending
11 11
12Signed-off-by: Khem Raj <raj.khem@gmail.com> 12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 13
14Index: webkitgtk-2.12.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp 14Index: webkitgtk-2.16.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp
15=================================================================== 15===================================================================
16--- webkitgtk-2.12.3.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp 16--- webkitgtk-2.16.3.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp
17+++ webkitgtk-2.12.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp 17+++ webkitgtk-2.16.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp
18@@ -86,7 +86,7 @@ static void pthreadSignalHandlerSuspendR 18@@ -88,7 +88,7 @@ static void pthreadSignalHandlerSuspendR
19 } 19 }
20 20
21 ucontext_t* userContext = static_cast<ucontext_t*>(ucontext); 21 ucontext_t* userContext = static_cast<ucontext_t*>(ucontext);
22-#if CPU(PPC) 22-#if CPU(PPC)
23+#if CPU(PPC) && defined(__GLIBC__) 23+#if CPU(PPC) && defined(__GLIBC__)
24 thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs; 24 threadData->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
25 #else 25 #else
26 thread->suspendedMachineContext = userContext->uc_mcontext; 26 threadData->suspendedMachineContext = userContext->uc_mcontext;
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.16.1.bb b/meta/recipes-sato/webkit/webkitgtk_2.16.3.bb
index a52d93cfbe..5feca17be3 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.16.1.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.16.3.bb
@@ -22,8 +22,8 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
22 file://gcc7.patch \ 22 file://gcc7.patch \
23 file://detect-atomics-during-configure.patch \ 23 file://detect-atomics-during-configure.patch \
24 " 24 "
25SRC_URI[md5sum] = "d3bcf995a667fd9febb9ab991acf0ca7" 25SRC_URI[md5sum] = "34dbbcad8a87a929519d93c67edd6d87"
26SRC_URI[sha256sum] = "eb92383232328ce655b703c64370ed3795662479719ad1b4a869ed46769d2945" 26SRC_URI[sha256sum] = "204e9131da0101b9bc8765716e70a897121af04b964d9827cd9f20816a77b512"
27 27
28inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc 28inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
29 29
@@ -76,6 +76,7 @@ EXTRA_OECMAKE_append_armv4 = " -DENABLE_JIT=OFF "
76# https://sourceware.org/bugzilla/show_bug.cgi?id=18430 76# https://sourceware.org/bugzilla/show_bug.cgi?id=18430
77EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF " 77EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF "
78EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF " 78EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF "
79EXTRA_OECMAKE_append_powerpc = " -DUSE_LD_GOLD=OFF "
79EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF " 80EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF "
80 81
81EXTRA_OECMAKE_append_aarch64 = " -DWTF_CPU_ARM64_CORTEXA53=ON" 82EXTRA_OECMAKE_append_aarch64 = " -DWTF_CPU_ARM64_CORTEXA53=ON"