summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-03-06 12:32:13 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2020-03-10 09:03:25 +0200
commit5114e3057ceb4afc7f2ae9f71bb351f9e5c7f553 (patch)
tree970f133c757794bcdc024acff5e053ca621ad47d /recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch
parentc29bdf41c4494e278a17a233048205bf212e040f (diff)
parentde2ecaa13fde8f30b1a6558bbbbdfecfd3cd4bd8 (diff)
downloadmeta-qt5-5114e3057ceb4afc7f2ae9f71bb351f9e5c7f553.tar.gz
Merge remote-tracking branch 'qt/5.14' into 5.15
* qt/5.14: de2ecaa1 coin: update module_config.yaml with meta-python2 support f9a58d62 Merge remote-tracking branch 'qt/upstream/master' into 5.14 2da972e5 qt5: update submodules 9be6548e qt5: update submodules b5e4f925 qtquicktimeline: add recipe abb42351 (qt/upstream/master) qtwebview: Skip if meta-python is not present caf09cd5 Add PyQtChart. f18d5948 qtbase: fix build with platform where FE macro are not defined c8cd55b0 qtwebkit: build with python3 0bbd0ebe qtwebengine: Link libatomic on x86/32bit 23914740 Revert "qtwebkit: remove" 8cadcbcb qt5: upgrade to 5.14.1 f13a3cec packagegroup-qt5-toolchain-target: Use TUNE_PKGARCH instead of MACHINE_ARCH a35403dc qtwebkit: remove a797f85c python-pyqt5, qtwebengine, qtwebkit, qt-kiosk-browser: skip without meta-python2 b1f4f1fd Revert "recipes: Use python3 during build" 47fb26de recipes: Use python3 during build 4060f68d qt-kiosk-browser: Only support arm/x86 fd376e15 qtwebengine: Fix missing headers found in build with clang 7f324f11 gstreamer1.0-plugins-good: Adjust bbappend for meson migration in core 1365691f qttools: remove ptest installation 254576f9 qt-kiosk-browser: Add recipe 47399df9 nativesdk-packagegroup: fix cmake builds using sdk Conflicts: recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtcharts_git.bb recipes-qt/qt5/qtcoap_git.bb recipes-qt/qt5/qtconnectivity_git.bb recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtimageformats_git.bb recipes-qt/qt5/qtknx_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtquick3d_git.bb recipes-qt/qt5/qtquickcontrols2_git.bb recipes-qt/qt5/qtremoteobjects_git.bb recipes-qt/qt5/qtscript_git.bb recipes-qt/qt5/qtserialbus_git.bb recipes-qt/qt5/qtsvg_git.bb recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebsockets_git.bb recipes-qt/qt5/qtwebview_git.bb Change-Id: I41b3b999dc1278342e33dda3b66af1990e8da090
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.patch69
1 files changed, 0 insertions, 69 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
deleted file mode 100644
index bf79b363..00000000
--- a/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch
+++ /dev/null
@@ -1,69 +0,0 @@
1From c4ceb318aa1064bfa677cdd800c52155eb1bed3a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 23 Aug 2018 04:06:17 +0000
4Subject: [PATCH] Fix build with non-glibc libc on musl
5
6Need to ensure glibc features are not assumed to be linux-wide
7
8Upstream-Status: Pending
9Signed-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
15diff --git a/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
16index 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)
55diff --git a/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp b/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp
56index 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"