diff options
| author | Khem Raj <raj.khem@gmail.com> | 2016-07-09 01:00:52 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-20 10:24:49 +0100 |
| commit | b9659af922b336e6d41c1dd0aa0f13e6975cff7b (patch) | |
| tree | 20ef4ea92e884364f50e02094e1abd7723b45471 /meta/recipes-sato | |
| parent | 6d8cc72e7f83b9819ff1bbdb72ca61f98de403a4 (diff) | |
| download | openembedded-core-b9659af922b336e6d41c1dd0aa0f13e6975cff7b.tar.gz openembedded-core-b9659af922b336e6d41c1dd0aa0f13e6975cff7b.tar.bz2 openembedded-core-b9659af922b336e6d41c1dd0aa0f13e6975cff7b.zip | |
webkitgtk: Fix build on ppc with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-sato')
| -rw-r--r-- | meta/recipes-sato/webkit/files/ppc-musl-fix.patch | 26 | ||||
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.12.3.bb | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/files/ppc-musl-fix.patch b/meta/recipes-sato/webkit/files/ppc-musl-fix.patch new file mode 100644 index 0000000000..5f58e4953e --- /dev/null +++ b/meta/recipes-sato/webkit/files/ppc-musl-fix.patch @@ -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; diff --git a/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb index c5e5432bfc..28517c44c8 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb @@ -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" |