summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-07-09 01:00:52 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-20 10:28:44 +0100
commitd2296eaa9ed5a54d9d12b65dfcd3a1427c5af1a3 (patch)
tree1272228b1076f331fb83c410968303a469daab2d
parentfa0b782be85afc9e404f26a67b13c5bbbf9f74af (diff)
downloadpoky-d2296eaa9ed5a54d9d12b65dfcd3a1427c5af1a3.tar.gz
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>
-rw-r--r--meta/recipes-sato/webkit/files/ppc-musl-fix.patch26
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.12.3.bb1
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 @@
1ucontext structure is different between musl and glibc for ppc
2therefore its not enough just to check for arch alone, we also
3need to check for libc type.
4
5Fixes errors like
6
7Source/JavaScriptCore/heap/MachineStackMarker.cpp:90:65: error: 'struct mcontext_t' has no member named 'uc_regs'; did you mean 'gregs'?
8 thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
9
10Upstream-Status: Pending
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
14Index: webkitgtk-2.12.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp
15===================================================================
16--- webkitgtk-2.12.3.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp
17+++ webkitgtk-2.12.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp
18@@ -86,7 +86,7 @@ static void pthreadSignalHandlerSuspendR
19 }
20
21 ucontext_t* userContext = static_cast<ucontext_t*>(ucontext);
22-#if CPU(PPC)
23+#if CPU(PPC) && defined(__GLIBC__)
24 thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
25 #else
26 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 = "\
17 file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \ 17 file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \
18 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ 18 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
19 file://musl-fixes.patch \ 19 file://musl-fixes.patch \
20 file://ppc-musl-fix.patch \
20 " 21 "
21SRC_URI[md5sum] = "aebb4029c09dd81664aa830e4a584c85" 22SRC_URI[md5sum] = "aebb4029c09dd81664aa830e4a584c85"
22SRC_URI[sha256sum] = "173cbb9a2eca23eee52e99965483ab25aa9c0569ef5b57041fc0c129cc26c307" 23SRC_URI[sha256sum] = "173cbb9a2eca23eee52e99965483ab25aa9c0569ef5b57041fc0c129cc26c307"