webkitgtk: Fix build on ppc with musl

(From OE-Core rev: b9659af922b336e6d41c1dd0aa0f13e6975cff7b)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj 2016-07-09 01:00:52 -07:00 committed by Richard Purdie
parent fa0b782be8
commit d2296eaa9e
2 changed files with 27 additions and 0 deletions

View File

@ -0,0 +1,26 @@
ucontext structure is different between musl and glibc for ppc
therefore its not enough just to check for arch alone, we also
need to check for libc type.
Fixes errors like
Source/JavaScriptCore/heap/MachineStackMarker.cpp:90:65: error: 'struct mcontext_t' has no member named 'uc_regs'; did you mean 'gregs'?
thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: webkitgtk-2.12.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp
===================================================================
--- webkitgtk-2.12.3.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp
+++ webkitgtk-2.12.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp
@@ -86,7 +86,7 @@ static void pthreadSignalHandlerSuspendR
}
ucontext_t* userContext = static_cast<ucontext_t*>(ucontext);
-#if CPU(PPC)
+#if CPU(PPC) && defined(__GLIBC__)
thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
#else
thread->suspendedMachineContext = userContext->uc_mcontext;

View File

@ -17,6 +17,7 @@ SRC_URI = "\
file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \
file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
file://musl-fixes.patch \
file://ppc-musl-fix.patch \
"
SRC_URI[md5sum] = "aebb4029c09dd81664aa830e4a584c85"
SRC_URI[sha256sum] = "173cbb9a2eca23eee52e99965483ab25aa9c0569ef5b57041fc0c129cc26c307"