summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
diff options
context:
space:
mode:
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.patch36
1 files changed, 18 insertions, 18 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 041ec4675f..d9a18e0ce9 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 @@
1From 4f9d736e0458ed33cd161cd164ad0acdac939f44 Mon Sep 17 00:00:00 2001 1From 322966273a8e085829261a397af37de0fbf51aad Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 6 Oct 2017 17:00:08 +0300 3Date: Fri, 6 Oct 2017 17:00:08 +0300
4Subject: [PATCH] Fix build with musl 4Subject: [PATCH] Fix build with musl
@@ -7,69 +7,69 @@ Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8 8
9--- 9---
10 Source/JavaScriptCore/runtime/MachineContext.h | 18 +++++++++++++++++- 10 Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++-----
11 Source/WTF/wtf/Platform.h | 2 +- 11 Source/WTF/wtf/Platform.h | 2 +-
12 2 files changed, 18 insertions(+), 2 deletions(-) 12 2 files changed, 6 insertions(+), 6 deletions(-)
13 13
14diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h 14diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h
15index bf0bdc7..84b8a8a 100644 15index 836d755..7665d25 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@@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext) 18@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext)
19 #error Unknown Architecture 19 #error Unknown Architecture
20 #endif 20 #endif
21 21
22-#elif defined(__GLIBC__) || defined(__BIONIC__) 22-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
23+#elif defined(__linux__) 23+#elif defined(__linux__)
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@@ -251,7 +251,7 @@ inline void*& framePointer(mcontext_t& machineContext) 27@@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext)
28 #error Unknown Architecture 28 #error Unknown Architecture
29 #endif 29 #endif
30 30
31-#elif defined(__GLIBC__) || defined(__BIONIC__) 31-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
32+#elif defined(__linux__) 32+#elif defined(__linux__)
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@@ -354,7 +354,7 @@ inline void*& instructionPointer(mcontext_t& machineContext) 36@@ -482,7 +482,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext)
37 #error Unknown Architecture 37 #error Unknown Architecture
38 #endif 38 #endif
39 39
40-#elif defined(__GLIBC__) || defined(__BIONIC__) 40-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
41+#elif defined(__linux__) 41+#elif defined(__linux__)
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@@ -466,7 +466,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) 45@@ -639,7 +639,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext)
46 #error Unknown Architecture 46 #error Unknown Architecture
47 #endif 47 #endif
48 48
49-#elif defined(__GLIBC__) || defined(__BIONIC__) 49-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
50+#elif defined(__linux__) 50+#elif defined(__linux__)
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@@ -583,7 +583,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) 54@@ -756,7 +756,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext)
55 #error Unknown Architecture 55 #error Unknown Architecture
56 #endif 56 #endif
57 57
58-#elif defined(__GLIBC__) || defined(__BIONIC__) 58-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
59+#elif defined(__linux__) 59+#elif defined(__linux__)
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)
63diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h 63diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
64index 551c047..e50b05a 100644 64index a841946..1e5c7dd 100644
65--- a/Source/WTF/wtf/Platform.h 65--- a/Source/WTF/wtf/Platform.h
66+++ b/Source/WTF/wtf/Platform.h 66+++ b/Source/WTF/wtf/Platform.h
67@@ -683,7 +683,7 @@ 67@@ -701,7 +701,7 @@
68 #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 68 #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
69 #endif 69 #endif
70 70
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(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (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+#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
73 #define HAVE_MACHINE_CONTEXT 1 73 #define HAVE_MACHINE_CONTEXT 1
74 #endif 74 #endif
75 75
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-06 09:17:15 +0000