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 | 28 |
1 files changed, 13 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 7cc4514fcc..041ec4675f 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,24 +1,25 @@ | |||
1 | From 415e31bd5444fa360af58b069f1b9db6607fca7d Mon Sep 17 00:00:00 2001 | 1 | From 4f9d736e0458ed33cd161cd164ad0acdac939f44 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 |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | |||
8 | --- | 9 | --- |
9 | Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++----- | 10 | Source/JavaScriptCore/runtime/MachineContext.h | 18 +++++++++++++++++- |
10 | Source/WTF/wtf/Platform.h | 2 +- | 11 | Source/WTF/wtf/Platform.h | 2 +- |
11 | 2 files changed, 6 insertions(+), 6 deletions(-) | 12 | 2 files changed, 18 insertions(+), 2 deletions(-) |
12 | 13 | ||
13 | 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 |
14 | index 95080b9..2bb689c 100644 | 15 | index bf0bdc7..84b8a8a 100644 |
15 | --- a/Source/JavaScriptCore/runtime/MachineContext.h | 16 | --- a/Source/JavaScriptCore/runtime/MachineContext.h |
16 | +++ b/Source/JavaScriptCore/runtime/MachineContext.h | 17 | +++ b/Source/JavaScriptCore/runtime/MachineContext.h |
17 | @@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext) | 18 | @@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext) |
18 | #error Unknown Architecture | 19 | #error Unknown Architecture |
19 | #endif | 20 | #endif |
20 | 21 | ||
21 | -#elif defined(__GLIBC__) | 22 | -#elif defined(__GLIBC__) || defined(__BIONIC__) |
22 | +#elif defined(__linux__) | 23 | +#elif defined(__linux__) |
23 | 24 | ||
24 | #if CPU(X86) | 25 | #if CPU(X86) |
@@ -27,7 +28,7 @@ index 95080b9..2bb689c 100644 | |||
27 | #error Unknown Architecture | 28 | #error Unknown Architecture |
28 | #endif | 29 | #endif |
29 | 30 | ||
30 | -#elif defined(__GLIBC__) | 31 | -#elif defined(__GLIBC__) || defined(__BIONIC__) |
31 | +#elif defined(__linux__) | 32 | +#elif defined(__linux__) |
32 | 33 | ||
33 | // The following sequence depends on glibc's sys/ucontext.h. | 34 | // The following sequence depends on glibc's sys/ucontext.h. |
@@ -36,7 +37,7 @@ index 95080b9..2bb689c 100644 | |||
36 | #error Unknown Architecture | 37 | #error Unknown Architecture |
37 | #endif | 38 | #endif |
38 | 39 | ||
39 | -#elif defined(__GLIBC__) | 40 | -#elif defined(__GLIBC__) || defined(__BIONIC__) |
40 | +#elif defined(__linux__) | 41 | +#elif defined(__linux__) |
41 | 42 | ||
42 | // The following sequence depends on glibc's sys/ucontext.h. | 43 | // The following sequence depends on glibc's sys/ucontext.h. |
@@ -45,7 +46,7 @@ index 95080b9..2bb689c 100644 | |||
45 | #error Unknown Architecture | 46 | #error Unknown Architecture |
46 | #endif | 47 | #endif |
47 | 48 | ||
48 | -#elif defined(__GLIBC__) | 49 | -#elif defined(__GLIBC__) || defined(__BIONIC__) |
49 | +#elif defined(__linux__) | 50 | +#elif defined(__linux__) |
50 | 51 | ||
51 | // The following sequence depends on glibc's sys/ucontext.h. | 52 | // The following sequence depends on glibc's sys/ucontext.h. |
@@ -54,24 +55,21 @@ index 95080b9..2bb689c 100644 | |||
54 | #error Unknown Architecture | 55 | #error Unknown Architecture |
55 | #endif | 56 | #endif |
56 | 57 | ||
57 | -#elif defined(__GLIBC__) | 58 | -#elif defined(__GLIBC__) || defined(__BIONIC__) |
58 | +#elif defined(__linux__) | 59 | +#elif defined(__linux__) |
59 | 60 | ||
60 | // The following sequence depends on glibc's sys/ucontext.h. | 61 | // The following sequence depends on glibc's sys/ucontext.h. |
61 | #if CPU(X86) | 62 | #if CPU(X86) |
62 | diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h | 63 | diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h |
63 | index 5a2863b..b36c3ff 100644 | 64 | index 551c047..e50b05a 100644 |
64 | --- a/Source/WTF/wtf/Platform.h | 65 | --- a/Source/WTF/wtf/Platform.h |
65 | +++ b/Source/WTF/wtf/Platform.h | 66 | +++ b/Source/WTF/wtf/Platform.h |
66 | @@ -680,7 +680,7 @@ | 67 | @@ -683,7 +683,7 @@ |
67 | #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 | 68 | #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 |
68 | #endif | 69 | #endif |
69 | 70 | ||
70 | -#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) | 71 | -#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) |
71 | +#if OS(DARWIN) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) | 72 | +#if OS(DARWIN) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) |
72 | #define HAVE_MACHINE_CONTEXT 1 | 73 | #define HAVE_MACHINE_CONTEXT 1 |
73 | #endif | 74 | #endif |
74 | 75 | ||
75 | -- | ||
76 | 2.14.1 | ||
77 | |||