diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-04-21 08:09:12 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-12 08:51:09 +0100 |
commit | 99df0c34705006cbab9de58bf6b796728a295b7a (patch) | |
tree | 36795369ee372b623d083350b3942f5bc0f85d69 /meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch | |
parent | 2b070ef738a30f23963fed4bec3470557a5dc2a3 (diff) | |
download | poky-99df0c34705006cbab9de58bf6b796728a295b7a.tar.gz |
webkitgtk: Upgrade to 2.16.1
Fix build with gcc7
Move all patches to webkit folder
Drop patches that were backports or have been upstreamed
(From OE-Core rev: bfbdd1a2069f199be9ba0909dd512469ff17b65e)
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>
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch b/meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch new file mode 100644 index 0000000000..4fdd56fea0 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | Replace __GLIBC__ with __linux__ since musl also supports it | ||
2 | so checking __linux__ is more accomodating | ||
3 | |||
4 | See http://git.alpinelinux.org/cgit/aports/tree/community/webkit2gtk/musl-fixes.patch?id=219435d86d7e8fac9474344a7431c62bd2525184 | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | |||
9 | Index: webkitgtk-2.12.1/Source/JavaScriptCore/heap/MachineStackMarker.cpp | ||
10 | =================================================================== | ||
11 | --- webkitgtk-2.12.1.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp | ||
12 | +++ webkitgtk-2.12.1/Source/JavaScriptCore/heap/MachineStackMarker.cpp | ||
13 | @@ -566,7 +566,7 @@ void* MachineThreads::Thread::Registers: | ||
14 | #error Unknown Architecture | ||
15 | #endif | ||
16 | |||
17 | -#elif defined(__GLIBC__) && ENABLE(JIT) | ||
18 | +#elif defined(__linux__) && ENABLE(JIT) | ||
19 | |||
20 | #if CPU(X86) | ||
21 | return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]); | ||
22 | @@ -665,7 +665,7 @@ void* MachineThreads::Thread::Registers: | ||
23 | #error Unknown Architecture | ||
24 | #endif | ||
25 | |||
26 | -#elif defined(__GLIBC__) | ||
27 | +#elif defined(__linux__) // glibc and musl | ||
28 | |||
29 | // The following sequence depends on glibc's sys/ucontext.h. | ||
30 | #if CPU(X86) | ||
31 | @@ -747,7 +747,7 @@ void* MachineThreads::Thread::Registers: | ||
32 | #error Unknown Architecture | ||
33 | #endif | ||
34 | |||
35 | -#elif defined(__GLIBC__) | ||
36 | +#elif defined(__linux__) // glibc and musl | ||
37 | |||
38 | // The following sequence depends on glibc's sys/ucontext.h. | ||
39 | #if CPU(X86) | ||
40 | @@ -838,7 +838,7 @@ void* MachineThreads::Thread::Registers: | ||
41 | #error Unknown Architecture | ||
42 | #endif | ||
43 | |||
44 | -#elif defined(__GLIBC__) | ||
45 | +#elif defined(__linux__) // glibc and musl | ||
46 | |||
47 | // The following sequence depends on glibc's sys/ucontext.h. | ||
48 | #if CPU(X86) | ||