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:49:29 +0100 |
| commit | bfbdd1a2069f199be9ba0909dd512469ff17b65e (patch) | |
| tree | f06897fc6a99838ad53301e6a25d205532466e0d /meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch | |
| parent | 9ba71dc40dd782d192504b0827ca91f0fe180abe (diff) | |
| download | openembedded-core-bfbdd1a2069f199be9ba0909dd512469ff17b65e.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
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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 @@ +Replace __GLIBC__ with __linux__ since musl also supports it +so checking __linux__ is more accomodating + +See http://git.alpinelinux.org/cgit/aports/tree/community/webkit2gtk/musl-fixes.patch?id=219435d86d7e8fac9474344a7431c62bd2525184 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: webkitgtk-2.12.1/Source/JavaScriptCore/heap/MachineStackMarker.cpp +=================================================================== +--- webkitgtk-2.12.1.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp ++++ webkitgtk-2.12.1/Source/JavaScriptCore/heap/MachineStackMarker.cpp +@@ -566,7 +566,7 @@ void* MachineThreads::Thread::Registers: + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) && ENABLE(JIT) ++#elif defined(__linux__) && ENABLE(JIT) + + #if CPU(X86) + return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]); +@@ -665,7 +665,7 @@ void* MachineThreads::Thread::Registers: + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) // glibc and musl + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -747,7 +747,7 @@ void* MachineThreads::Thread::Registers: + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) // glibc and musl + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -838,7 +838,7 @@ void* MachineThreads::Thread::Registers: + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) // glibc and musl + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) |