summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2018-06-26 12:42:33 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2018-06-27 12:03:36 +0000
commit6765cbe6a255771cc1d06e5d3878c7e705769fc3 (patch)
tree377c10e198c33bb5ffa509f24748891a7e341a02 /recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch
parentb84881444814a361fcc17e7eb34407fb175541da (diff)
parent40054db1de152d85c22aefdae50b136ca56967c5 (diff)
downloadmeta-qt5-6765cbe6a255771cc1d06e5d3878c7e705769fc3.tar.gz
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
* qtyocto/upstream/master: 40054db qt5: qtbase: Upgrade Double-Conversion dd1ce3c README: Rework to start using GitHub for development ef5f5d9 qt5: upgrade to 5.11.1 820f3ef qt5: add common PACKAGECONFIG for QtQuickCompiler e199d80 python-pyqt5: update recipe to 5.10.1 65db89e qtbase: don't pass empty filename to function 3b27896 nativesdk-qtbase: add quotes to CC and CXX in environment file a36cc5f libvcard: add recipe 1ac92b6 qtbase: Add packageconfigs for renameat2 and getentropy use 557aabd qttranslations: remove qtquick1 translation package 00aafa0 qt5-creator: Remove qtquick1 dependency 731334a qtwebengine: fix build with plugins as well as ozone enabled 70ce980 qtwebengine: add -fpermissive 33f58ff qtwebengine: fix build with gcc8, part II 267a38f qtwebengine: fix build with gcc8 7193a7f qtquick1: remove recipe and all references 29445f6 qtwebkit: do not skip build - use cmake as build system dde9b55 qt5: refresh the patches and update them on meta-qt5 repositories e0a4e23 qt5: Update to Qt 5.11.0 73f99f2 gstreamer1.0-plugins-{good,bad}: move the qt5 PACKAGECONFIG from bad to good bbappend Change-Id: Ib58d0e103bda0b58338989c00f1fa80bd699534c
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch
new file mode 100644
index 00000000..8dd07d65
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch
@@ -0,0 +1,24 @@
1From 418ff96920a520a4c9d082f56864ee8654f584f7 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Thu, 14 Dec 2017 11:28:10 +0200
4Subject: [PATCH] musl: link against libexecinfo
5
6Change-Id: Ifada60f9c72691973612850121f6fb152d70839a
7Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
8---
9 src/core/core_module.pro | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/src/core/core_module.pro b/src/core/core_module.pro
13index d21985e6..eeebeb4f 100644
14--- a/src/core/core_module.pro
15+++ b/src/core/core_module.pro
16@@ -54,7 +54,7 @@ linux {
17 POST_TARGETDEPS += $$NINJA_TARGETDEPS
18
19
20-LIBS_PRIVATE += -L$$api_library_path
21+LIBS_PRIVATE += -L$$api_library_path -lexecinfo
22 CONFIG *= no_smart_library_merge
23 osx {
24 LIBS_PRIVATE += -Wl,-force_load,$${api_library_path}$${QMAKE_DIR_SEP}lib$${api_library_name}.a