diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-10-11 15:32:55 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-10-14 16:19:16 +0300 |
commit | a6d84200c76439308699246d62bb6a6809cce1d5 (patch) | |
tree | a41f9c76009d0cf571f5b978607d29749fa4e62e /recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch | |
parent | 8e485a2bfa4632bfefea861c2a06d9a6e8fc5c33 (diff) | |
parent | 0c7eb257c3b0f03592e407e13c635d9e523fbcd0 (diff) |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
* qtyocto/upstream/master:
0c7eb25 layer.conf: Add thud to LAYERSERIES_COMPAT
4e6c472 qt5-creator: Check before editing translation Makefile
15a8c25 qt5-creator: Pick native tools from native sysroot e.g. lrelease etc.
f11e942 qt5-creator: fix build with QMAKE_AR
0cf5966 qt5-creator: upgrade to 4.7.1+
4fb1e60 qt: package all files in ${PN}-examples
2109ff6 qt: use single -dev and -staticdev package
5c5b7e8 qt5-creator: refresh .patch files and push them to meta-qt5 fork
333437c qt5-creator: Fix build due to missing lrelease
3ad2acb qtchooser: Update to latest git
1ed9bcb qtwebengine: Add patches to fix breakpad in new webengine release on musl
24d6fc2 qtbase: Do not use cross_compile check
d0cd7a7 qtbase: Fix errors due to -isystem
8123922 qtbase: Fix build error for armv8BE multilib.
f9e80ed qt5: update to latest revision in 5.11 branch
3e7da25 qt5: update to Qt 5.11.2
cd0da4e libqofono: include /qt5/mkspecs in ${PN}-dev
db45ea6 qtwebkit-examples: Fix build with QT 5.11
d498eb6 qtwebkit: Use relative paths for pri files when cross compile
b716195 qmake5_paths: change the default QT_DIR_NAME to be empty
3224b02 nativesdk-qtbase: use default PACKAGES
66c49f8 qt5-creator: strip few more useless rpaths
03b4c7b qt: remove unnecessary FILES.*-dbg variables for packaging .debug files
5164f84 qt3d-runtime: Fix compile errors as seen with mips/musl
08aaba0 qt3d-runtime: upgrade to latest revision in 2.0 branch
a8832a7 qtwebkit: Make qtwebkit support arm32 BE.
215e81d qtscript: add patches to meta-qt5 fork
66a9704 qtscript: Fix build on musl
edf1e43 qtwebkit: add patches to meta-qt5 fork
a307eb0 qtwebkit: Fix conflicts with -I and -isystem
3e4141c qtwebkit: Fix build with musl
c977d68 qt5-creator: Strip out redundant RPATH
189dd8a qt5-creator: Fix building botan for all non-x86 arches
85e665b qtwebengine: use nasm-native instead of yasm-native
75bc440 qtbase: fix install locations used in static builds
823fa38 qtwebengine: enable debug info for webengine
Conflicts:
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/0001-Add-linux-oe-g-platform.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtcanvas3d_git.bb
recipes-qt/qt5/qtcharts_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdatavis3d_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtgamepad_git.bb
recipes-qt/qt5/qtgraphicaleffects_git.bb
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtknx_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtmqtt_git.bb
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtnetworkauth_git.bb
recipes-qt/qt5/qtopcua_git.bb
recipes-qt/qt5/qtpurchasing_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtremoteobjects_git.bb
recipes-qt/qt5/qtscript_git.bb
recipes-qt/qt5/qtscxml_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsvg_git.bb
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qtvirtualkeyboard_git.bb
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebchannel_git.bb
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebglplugin_git.bb
recipes-qt/qt5/qtwebsockets_git.bb
recipes-qt/qt5/qtwebview_git.bb
recipes-qt/qt5/qtx11extras_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Change-Id: I7542ddc6eee1ae7e444f24fd1d502291af40afee
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..dead46d1 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch @@ -0,0 +1,69 @@ +From 9db9a8850602c2446b1a7ee96608fd74cf56a342 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 23 Aug 2018 04:06:17 +0000 +Subject: [PATCH] Fix build with non-glibc libc on musl + +Need to ensure glibc features are not assumed to be linux-wide + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Source/JavaScriptCore/heap/MachineStackMarker.cpp | 8 ++++---- + .../inspector/JSGlobalObjectInspectorController.cpp | 2 ++ + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/Source/JavaScriptCore/heap/MachineStackMarker.cpp +index 883914fd3..ce4e8d331 100644 +--- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp ++++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp +@@ -566,7 +566,7 @@ void* MachineThreads::Thread::Registers::stackPointer() const + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) && ENABLE(JIT) ++#elif defined(__linux__) && ENABLE(JIT) + + #if CPU(X86) + return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]); +@@ -665,7 +665,7 @@ void* MachineThreads::Thread::Registers::framePointer() const + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -747,7 +747,7 @@ void* MachineThreads::Thread::Registers::instructionPointer() const + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -838,7 +838,7 @@ void* MachineThreads::Thread::Registers::llintPC() const + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +diff --git a/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp b/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp +index fd7f869d4..e95391b32 100644 +--- a/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp ++++ b/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp +@@ -51,8 +51,10 @@ + #include <cxxabi.h> + #if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK)) + #include <dlfcn.h> ++#if defined(__GLIBC__) + #include <execinfo.h> + #endif ++#endif + + #if ENABLE(REMOTE_INSPECTOR) + #include "JSGlobalObjectDebuggable.h" |