diff options
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch index 0c145c7ebd..6dcb52956c 100644 --- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c4d4d9f1aa74addefdad40294cf16d9e0b3dd6ec Mon Sep 17 00:00:00 2001 | 1 | From 828a500d5be62ba6fc94bd4fac3fe4bf1b1d4f6d Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 6 Oct 2017 17:00:08 +0300 | 3 | Date: Fri, 6 Oct 2017 17:00:08 +0300 |
4 | Subject: [PATCH] Fix build with musl | 4 | Subject: [PATCH] Fix build with musl |
@@ -8,14 +8,14 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
8 | 8 | ||
9 | --- | 9 | --- |
10 | Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++----- | 10 | Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++----- |
11 | Source/WTF/wtf/Platform.h | 2 +- | 11 | Source/WTF/wtf/PlatformHave.h | 2 +- |
12 | 2 files changed, 6 insertions(+), 6 deletions(-) | 12 | 2 files changed, 6 insertions(+), 6 deletions(-) |
13 | 13 | ||
14 | diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h | 14 | diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h |
15 | index 823964c2..00841146 100644 | 15 | index c5052527..95ef98b5 100644 |
16 | --- a/Source/JavaScriptCore/runtime/MachineContext.h | 16 | --- a/Source/JavaScriptCore/runtime/MachineContext.h |
17 | +++ b/Source/JavaScriptCore/runtime/MachineContext.h | 17 | +++ b/Source/JavaScriptCore/runtime/MachineContext.h |
18 | @@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext) | 18 | @@ -196,7 +196,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext) |
19 | #error Unknown Architecture | 19 | #error Unknown Architecture |
20 | #endif | 20 | #endif |
21 | 21 | ||
@@ -24,7 +24,7 @@ index 823964c2..00841146 100644 | |||
24 | 24 | ||
25 | #if CPU(X86) | 25 | #if CPU(X86) |
26 | return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); | 26 | return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); |
27 | @@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext) | 27 | @@ -347,7 +347,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext) |
28 | #error Unknown Architecture | 28 | #error Unknown Architecture |
29 | #endif | 29 | #endif |
30 | 30 | ||
@@ -33,7 +33,7 @@ index 823964c2..00841146 100644 | |||
33 | 33 | ||
34 | // The following sequence depends on glibc's sys/ucontext.h. | 34 | // The following sequence depends on glibc's sys/ucontext.h. |
35 | #if CPU(X86) | 35 | #if CPU(X86) |
36 | @@ -482,7 +482,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext) | 36 | @@ -498,7 +498,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext) |
37 | #error Unknown Architecture | 37 | #error Unknown Architecture |
38 | #endif | 38 | #endif |
39 | 39 | ||
@@ -42,7 +42,7 @@ index 823964c2..00841146 100644 | |||
42 | 42 | ||
43 | // The following sequence depends on glibc's sys/ucontext.h. | 43 | // The following sequence depends on glibc's sys/ucontext.h. |
44 | #if CPU(X86) | 44 | #if CPU(X86) |
45 | @@ -639,7 +639,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) | 45 | @@ -656,7 +656,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) |
46 | #error Unknown Architecture | 46 | #error Unknown Architecture |
47 | #endif | 47 | #endif |
48 | 48 | ||
@@ -51,7 +51,7 @@ index 823964c2..00841146 100644 | |||
51 | 51 | ||
52 | // The following sequence depends on glibc's sys/ucontext.h. | 52 | // The following sequence depends on glibc's sys/ucontext.h. |
53 | #if CPU(X86) | 53 | #if CPU(X86) |
54 | @@ -756,7 +756,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) | 54 | @@ -773,7 +773,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) |
55 | #error Unknown Architecture | 55 | #error Unknown Architecture |
56 | #endif | 56 | #endif |
57 | 57 | ||
@@ -60,13 +60,13 @@ index 823964c2..00841146 100644 | |||
60 | 60 | ||
61 | // The following sequence depends on glibc's sys/ucontext.h. | 61 | // The following sequence depends on glibc's sys/ucontext.h. |
62 | #if CPU(X86) | 62 | #if CPU(X86) |
63 | diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h | 63 | diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h |
64 | index 34f7cb14..32ad9150 100644 | 64 | index daca20fe..53eae6ba 100644 |
65 | --- a/Source/WTF/wtf/Platform.h | 65 | --- a/Source/WTF/wtf/PlatformHave.h |
66 | +++ b/Source/WTF/wtf/Platform.h | 66 | +++ b/Source/WTF/wtf/PlatformHave.h |
67 | @@ -714,7 +714,7 @@ | 67 | @@ -222,7 +222,7 @@ |
68 | 68 | #define HAVE_HOSTED_CORE_ANIMATION 1 | |
69 | #endif /* OS(DARWIN) */ | 69 | #endif |
70 | 70 | ||
71 | -#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) | 71 | -#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) |
72 | +#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) | 72 | +#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) |