diff options
author | Chenxi Mao <parheliamm@126.com> | 2020-04-10 08:46:18 +0800 |
---|---|---|
committer | Chenxi Mao <parheliamm@126.com> | 2020-04-11 15:21:38 +0800 |
commit | dd2fd47dc0acdf90f73a639149aa59269a72f9cb (patch) | |
tree | 84a26d65e6cb33040db0b77b79177f4801696f9d /recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch | |
parent | 84278d09aef9f917dd695df8c424c5d61395bdf3 (diff) | |
download | meta-qt5-dd2fd47dc0acdf90f73a639149aa59269a72f9cb.tar.gz |
QTWebKit: Fix build error on QT-5.15 branch
There are 2 changes to build QtWebkit on QT-5.15
1. Move SHA1 to QTwebkit tag QtWebKit 5.212.0 Alpha 4
SHA1: 444bd2bda5fa46c2b4b99adaf6e9b2074b03a0d1
2. Remove python3 patch.
Fixes: QTBUG-83426
Change-Id: I6a1f1d8a29c828e28e3c8192c1b863a85991080e
Reviewed-by: Chenxi Mao <chenxi.mao2013@gmail.com>
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch b/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch new file mode 100644 index 00000000..bf79b363 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch | |||
@@ -0,0 +1,69 @@ | |||
1 | From c4ceb318aa1064bfa677cdd800c52155eb1bed3a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 23 Aug 2018 04:06:17 +0000 | ||
4 | Subject: [PATCH] Fix build with non-glibc libc on musl | ||
5 | |||
6 | Need to ensure glibc features are not assumed to be linux-wide | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | Source/JavaScriptCore/heap/MachineStackMarker.cpp | 8 ++++---- | ||
12 | .../inspector/JSGlobalObjectInspectorController.cpp | 2 ++ | ||
13 | 2 files changed, 6 insertions(+), 4 deletions(-) | ||
14 | |||
15 | diff --git a/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/Source/JavaScriptCore/heap/MachineStackMarker.cpp | ||
16 | index 883914fd3..ce4e8d331 100644 | ||
17 | --- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp | ||
18 | +++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp | ||
19 | @@ -566,7 +566,7 @@ void* MachineThreads::Thread::Registers::stackPointer() const | ||
20 | #error Unknown Architecture | ||
21 | #endif | ||
22 | |||
23 | -#elif defined(__GLIBC__) && ENABLE(JIT) | ||
24 | +#elif defined(__linux__) && ENABLE(JIT) | ||
25 | |||
26 | #if CPU(X86) | ||
27 | return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]); | ||
28 | @@ -665,7 +665,7 @@ void* MachineThreads::Thread::Registers::framePointer() const | ||
29 | #error Unknown Architecture | ||
30 | #endif | ||
31 | |||
32 | -#elif defined(__GLIBC__) | ||
33 | +#elif defined(__linux__) | ||
34 | |||
35 | // The following sequence depends on glibc's sys/ucontext.h. | ||
36 | #if CPU(X86) | ||
37 | @@ -747,7 +747,7 @@ void* MachineThreads::Thread::Registers::instructionPointer() const | ||
38 | #error Unknown Architecture | ||
39 | #endif | ||
40 | |||
41 | -#elif defined(__GLIBC__) | ||
42 | +#elif defined(__linux__) | ||
43 | |||
44 | // The following sequence depends on glibc's sys/ucontext.h. | ||
45 | #if CPU(X86) | ||
46 | @@ -838,7 +838,7 @@ void* MachineThreads::Thread::Registers::llintPC() const | ||
47 | #error Unknown Architecture | ||
48 | #endif | ||
49 | |||
50 | -#elif defined(__GLIBC__) | ||
51 | +#elif defined(__linux__) | ||
52 | |||
53 | // The following sequence depends on glibc's sys/ucontext.h. | ||
54 | #if CPU(X86) | ||
55 | diff --git a/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp b/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp | ||
56 | index fd7f869d4..e95391b32 100644 | ||
57 | --- a/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp | ||
58 | +++ b/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp | ||
59 | @@ -51,8 +51,10 @@ | ||
60 | #include <cxxabi.h> | ||
61 | #if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK)) | ||
62 | #include <dlfcn.h> | ||
63 | +#if defined(__GLIBC__) | ||
64 | #include <execinfo.h> | ||
65 | #endif | ||
66 | +#endif | ||
67 | |||
68 | #if ENABLE(REMOTE_INSPECTOR) | ||
69 | #include "JSGlobalObjectDebuggable.h" | ||