diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-08 16:36:58 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-09 09:34:19 +0000 |
commit | e1bf33d16f6131b7af2603c0e4a6e952148ef53b (patch) | |
tree | ce3523b8da78b0cee8d335f216d1911e1631a318 | |
parent | 2c94f520b0554c7ad1defb23d8c56a7bd1f8e2ca (diff) | |
download | meta-qt5-e1bf33d16f6131b7af2603c0e4a6e952148ef53b.tar.gz |
qt5-creator: fix build with musl
Change-Id: I4a5f92a94f2df289c9584d7be51caf67c3b3f5e3
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r-- | recipes-qt/qt5/qt5-creator/0003-Link-with-libexecinfo-on-musl.patch | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qt5-creator/0003-Link-with-libexecinfo-on-musl.patch b/recipes-qt/qt5/qt5-creator/0003-Link-with-libexecinfo-on-musl.patch index 9b225a57..d17f60b4 100644 --- a/recipes-qt/qt5/qt5-creator/0003-Link-with-libexecinfo-on-musl.patch +++ b/recipes-qt/qt5/qt5-creator/0003-Link-with-libexecinfo-on-musl.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 88afa7173c7d0c97e15d9ee9c58e8c0364799bb7 Mon Sep 17 00:00:00 2001 | 1 | From ec7aec2f6c56889c96dc12af46059a7f3d4c3a37 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 16 Jan 2018 13:26:57 +0000 | 3 | Date: Tue, 16 Jan 2018 13:26:57 +0000 |
4 | Subject: [PATCH] Link with libexecinfo on musl | 4 | Subject: [PATCH] Link with libexecinfo on musl |
@@ -6,8 +6,9 @@ Subject: [PATCH] Link with libexecinfo on musl | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 7 | Signed-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 | 1 file changed, 1 insertion(+) | 10 | src/plugins/qmldesigner/designercore/designercore-lib.pri | 2 ++ |
11 | 2 files changed, 3 insertions(+) | ||
11 | 12 | ||
12 | diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro | 13 | diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro |
13 | index f5a34aa0d5..4a1359dd5c 100644 | 14 | index f5a34aa0d5..4a1359dd5c 100644 |
@@ -18,3 +19,16 @@ index f5a34aa0d5..4a1359dd5c 100644 | |||
18 | 19 | ||
19 | include(shared/shared.pri) | 20 | include(shared/shared.pri) |
20 | +LIBS *= -lexecinfo | 21 | +LIBS *= -lexecinfo |
22 | diff --git a/src/plugins/qmldesigner/designercore/designercore-lib.pri b/src/plugins/qmldesigner/designercore/designercore-lib.pri | ||
23 | index 935b29728e..31527267fd 100644 | ||
24 | --- a/src/plugins/qmldesigner/designercore/designercore-lib.pri | ||
25 | +++ b/src/plugins/qmldesigner/designercore/designercore-lib.pri | ||
26 | @@ -2,6 +2,8 @@ include($$PWD/filemanager/filemanager.pri) | ||
27 | |||
28 | QT += network | ||
29 | |||
30 | +LIBS *= -lexecinfo | ||
31 | + | ||
32 | DEFINES += TEST_EXPORTS | ||
33 | DEFINES += DESIGNER_CORE_LIBRARY | ||
34 | INCLUDEPATH += $$PWD \ | ||