summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2020-01-13 15:42:26 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2020-01-13 15:57:32 +0200
commitf6ebff397a53e9c2a23f67d1fc74b5fed11df4f9 (patch)
treed0094937e85e890e9379d1f1de769af62fb6e656 /recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch
parent9ff0a36249205d36bb44cc34a26cb6201180a89f (diff)
parent1b8e557011fffd0446e5f660d1b317c664a7cf08 (diff)
downloadmeta-qt5-f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9.tar.gz
Merge remote-tracking branch 'qt/upstream/master' into 5.14
* qt/upstream/master: (28 commits) qtbase: Use pcre packages by default qt5: use PACKAGECONFIG to disable tests and examples qtlocation: use geoclue 2 qtbase: use offscreen platform plugin for tools qtbase: add openssl PACKAGECONFIG for native nativesdk qtbase-native: disable vulkan support maliit-framework-qt5: fix test installations qtenginio: remove obsolete module ogl-runtime: update to v2.5.0 release qtquick3d: add recipe qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance qt5: Update to Qt 5.14.0 qtbase: Fix patch fuzz detected with devtool qtbase: Backport the patch from upstream gerrit qt5-creator: Update musl patch to link qmldesigner with -lexecinfo qtwebengine: Move CharAllocator definition to header qt5-creator: Add missing dep on libz.so qt5-creator: Make clang-format patch work with multiple clang versions qtwebengine: Include cstddef for size_t definition ... Change-Id: Ia71a5f1c53e8ce18a1a8b219f8c8ffee96723fb7
Diffstat (limited to 'recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch')
-rw-r--r--recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch31
1 files changed, 13 insertions, 18 deletions
diff --git a/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch b/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch
index d17f60b4..da7561ce 100644
--- a/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch
+++ b/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch
@@ -1,4 +1,4 @@
1From ec7aec2f6c56889c96dc12af46059a7f3d4c3a37 Mon Sep 17 00:00:00 2001 1From 33299724b8719d53b26c9055a76a61c358270110 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 16 Jan 2018 13:26:57 +0000 3Date: Tue, 16 Jan 2018 13:26:57 +0000
4Subject: [PATCH] Link with libexecinfo on musl 4Subject: [PATCH] Link with libexecinfo on musl
@@ -6,29 +6,24 @@ Subject: [PATCH] Link with libexecinfo on musl
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8--- 8---
9 src/plugins/debugger/debugger.pro | 1 + 9 src/plugins/debugger/debugger.pro | 1 +
10 src/plugins/qmldesigner/designercore/designercore-lib.pri | 2 ++ 10 1 file changed, 1 insertion(+)
11 2 files changed, 3 insertions(+)
12 11
13diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
14index f5a34aa0d5..4a1359dd5c 100644
15--- a/src/plugins/debugger/debugger.pro 12--- a/src/plugins/debugger/debugger.pro
16+++ b/src/plugins/debugger/debugger.pro 13+++ b/src/plugins/debugger/debugger.pro
17@@ -141,3 +141,4 @@ include(console/console.pri) 14@@ -139,3 +139,4 @@ include(console/console.pri)
18 include(analyzer/analyzer.pri) 15 include(analyzer/analyzer.pri)
19 16
20 include(shared/shared.pri) 17 include(shared/shared.pri)
21+LIBS *= -lexecinfo 18+LIBS *= -lexecinfo
22diff --git a/src/plugins/qmldesigner/designercore/designercore-lib.pri b/src/plugins/qmldesigner/designercore/designercore-lib.pri 19--- a/src/plugins/qmldesigner/qmldesignerplugin.pro
23index 935b29728e..31527267fd 100644 20+++ b/src/plugins/qmldesigner/qmldesignerplugin.pro
24--- a/src/plugins/qmldesigner/designercore/designercore-lib.pri 21@@ -3,7 +3,7 @@ CONFIG += exceptions
25+++ b/src/plugins/qmldesigner/designercore/designercore-lib.pri
26@@ -2,6 +2,8 @@ include($$PWD/filemanager/filemanager.pri)
27 22
28 QT += network 23 INCLUDEPATH += $$PWD
24
25-unix:!openbsd:!osx: LIBS += -lrt # posix shared memory
26+unix:!openbsd:!osx: LIBS += -lexecinfo -lrt # posix shared memory
27
28 include(../../qtcreatorplugin.pri)
29 29
30+LIBS *= -lexecinfo
31+
32 DEFINES += TEST_EXPORTS
33 DEFINES += DESIGNER_CORE_LIBRARY
34 INCLUDEPATH += $$PWD \