diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-05-24 11:13:40 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-25 22:36:09 +0100 |
commit | 5477beb7dbf52577d36bf833e768b088b09bd2e9 (patch) | |
tree | f9777a343b6f640dcb90a5de268b961f6206c802 /meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch | |
parent | 8c18e3c0620a57b5f1841f4592889e52a4853e3c (diff) | |
download | poky-5477beb7dbf52577d36bf833e768b088b09bd2e9.tar.gz |
webkitgtk: update 2.32.0 -> 2.32.1
Drop 49a19c49c6de8af74e521f36cb43e6c1ec2e391c.patch
(backport)
0001-Fix-build-with-musl.patch
(problem fixed upstream).
(From OE-Core rev: b824f728c9f78c9c5777987a17bfd794c60ad0ec)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 | 91 |
1 files changed, 0 insertions, 91 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 deleted file mode 100644 index 1ccef1fdc8..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch +++ /dev/null | |||
@@ -1,91 +0,0 @@ | |||
1 | From 828a500d5be62ba6fc94bd4fac3fe4bf1b1d4f6d Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 6 Oct 2017 17:00:08 +0300 | ||
4 | Subject: [PATCH] Fix build with musl | ||
5 | |||
6 | Upstream-Status: Accepted | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | |||
9 | --- | ||
10 | Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++----- | ||
11 | Source/WTF/wtf/PlatformHave.h | 2 +- | ||
12 | 2 files changed, 6 insertions(+), 6 deletions(-) | ||
13 | |||
14 | --- a/Source/JavaScriptCore/runtime/MachineContext.h | ||
15 | +++ b/Source/JavaScriptCore/runtime/MachineContext.h | ||
16 | @@ -196,7 +196,7 @@ static inline void*& stackPointerImpl(mc | ||
17 | #error Unknown Architecture | ||
18 | #endif | ||
19 | |||
20 | -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) | ||
21 | +#elif defined(__linux__) | ||
22 | |||
23 | #if CPU(X86) | ||
24 | return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); | ||
25 | @@ -347,7 +347,7 @@ static inline void*& framePointerImpl(mc | ||
26 | #error Unknown Architecture | ||
27 | #endif | ||
28 | |||
29 | -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) | ||
30 | +#elif defined(__linux__) | ||
31 | |||
32 | // The following sequence depends on glibc's sys/ucontext.h. | ||
33 | #if CPU(X86) | ||
34 | @@ -498,7 +498,7 @@ static inline void*& instructionPointerI | ||
35 | #error Unknown Architecture | ||
36 | #endif | ||
37 | |||
38 | -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) | ||
39 | +#elif defined(__linux__) | ||
40 | |||
41 | // The following sequence depends on glibc's sys/ucontext.h. | ||
42 | #if CPU(X86) | ||
43 | @@ -656,7 +656,7 @@ inline void*& argumentPointer<1>(mcontex | ||
44 | #error Unknown Architecture | ||
45 | #endif | ||
46 | |||
47 | -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) | ||
48 | +#elif defined(__linux__) | ||
49 | |||
50 | // The following sequence depends on glibc's sys/ucontext.h. | ||
51 | #if CPU(X86) | ||
52 | @@ -773,7 +773,7 @@ inline void*& llintInstructionPointer(mc | ||
53 | #error Unknown Architecture | ||
54 | #endif | ||
55 | |||
56 | -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) | ||
57 | +#elif defined(__linux__) | ||
58 | |||
59 | // The following sequence depends on glibc's sys/ucontext.h. | ||
60 | #if CPU(X86) | ||
61 | --- a/Source/WTF/wtf/PlatformHave.h | ||
62 | +++ b/Source/WTF/wtf/PlatformHave.h | ||
63 | @@ -202,7 +202,7 @@ | ||
64 | #define HAVE_HOSTED_CORE_ANIMATION 1 | ||
65 | #endif | ||
66 | |||
67 | -#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) | ||
68 | +#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) | ||
69 | #define HAVE_MACHINE_CONTEXT 1 | ||
70 | #endif | ||
71 | |||
72 | --- a/Source/WebCore/xml/XPathGrammar.cpp | ||
73 | +++ b/Source/WebCore/xml/XPathGrammar.cpp | ||
74 | @@ -966,7 +966,7 @@ int yydebug; | ||
75 | #if YYERROR_VERBOSE | ||
76 | |||
77 | # ifndef yystrlen | ||
78 | -# if defined __GLIBC__ && defined _STRING_H | ||
79 | +# if defined __linux__ && defined _STRING_H | ||
80 | # define yystrlen strlen | ||
81 | # else | ||
82 | /* Return the length of YYSTR. */ | ||
83 | @@ -989,7 +989,7 @@ yystrlen (yystr) | ||
84 | # endif | ||
85 | |||
86 | # ifndef yystpcpy | ||
87 | -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE | ||
88 | +# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE | ||
89 | # define yystpcpy stpcpy | ||
90 | # else | ||
91 | /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in | ||