diff options
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch | 12 | ||||
-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 | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
13 | 13 | ||
14 | Index: webkitgtk-2.12.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp | 14 | Index: 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 | " |
25 | SRC_URI[md5sum] = "d3bcf995a667fd9febb9ab991acf0ca7" | 25 | SRC_URI[md5sum] = "34dbbcad8a87a929519d93c67edd6d87" |
26 | SRC_URI[sha256sum] = "eb92383232328ce655b703c64370ed3795662479719ad1b4a869ed46769d2945" | 26 | SRC_URI[sha256sum] = "204e9131da0101b9bc8765716e70a897121af04b964d9827cd9f20816a77b512" |
27 | 27 | ||
28 | inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc | 28 | inherit 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 |
77 | EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF " | 77 | EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF " |
78 | EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF " | 78 | EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF " |
79 | EXTRA_OECMAKE_append_powerpc = " -DUSE_LD_GOLD=OFF " | ||
79 | EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF " | 80 | EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF " |
80 | 81 | ||
81 | EXTRA_OECMAKE_append_aarch64 = " -DWTF_CPU_ARM64_CORTEXA53=ON" | 82 | EXTRA_OECMAKE_append_aarch64 = " -DWTF_CPU_ARM64_CORTEXA53=ON" |