aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch
diff options
context:
space:
mode:
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.patch36
1 files changed, 19 insertions, 17 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..c1fd2340 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,34 +1,36 @@
-From ec7aec2f6c56889c96dc12af46059a7f3d4c3a37 Mon Sep 17 00:00:00 2001
+From 0701dd54b228e58b913d09e5a87f70de77575cc7 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 16 Jan 2018 13:26:57 +0000
Subject: [PATCH] Link with libexecinfo on musl
+Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+
---
- src/plugins/debugger/debugger.pro | 1 +
- src/plugins/qmldesigner/designercore/designercore-lib.pri | 2 ++
- 2 files changed, 3 insertions(+)
+ src/plugins/debugger/debugger.pro | 1 +
+ src/plugins/qmldesigner/qmldesignerplugin.pro | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
-index f5a34aa0d5..4a1359dd5c 100644
+index 6c38efaca8..ba86639d72 100644
--- a/src/plugins/debugger/debugger.pro
+++ b/src/plugins/debugger/debugger.pro
-@@ -141,3 +141,4 @@ include(console/console.pri)
+@@ -137,3 +137,4 @@ include(console/console.pri)
include(analyzer/analyzer.pri)
include(shared/shared.pri)
+LIBS *= -lexecinfo
-diff --git a/src/plugins/qmldesigner/designercore/designercore-lib.pri b/src/plugins/qmldesigner/designercore/designercore-lib.pri
-index 935b29728e..31527267fd 100644
---- a/src/plugins/qmldesigner/designercore/designercore-lib.pri
-+++ b/src/plugins/qmldesigner/designercore/designercore-lib.pri
-@@ -2,6 +2,8 @@ include($$PWD/filemanager/filemanager.pri)
+diff --git a/src/plugins/qmldesigner/qmldesignerplugin.pro b/src/plugins/qmldesigner/qmldesignerplugin.pro
+index 85a7685da5..d69cabcaaf 100644
+--- a/src/plugins/qmldesigner/qmldesignerplugin.pro
++++ b/src/plugins/qmldesigner/qmldesignerplugin.pro
+@@ -4,7 +4,7 @@ CONFIG += exceptions
+ INCLUDEPATH += $$PWD
+ INCLUDEPATH += $$PWD/components
+
+-unix:!openbsd:!osx: LIBS += -lrt # posix shared memory
++unix:!openbsd:!osx: LIBS += -lexecinfo -lrt # posix shared memory
- QT += network
+ include(../../qtcreatorplugin.pri)
-+LIBS *= -lexecinfo
-+
- DEFINES += TEST_EXPORTS
- DEFINES += DESIGNER_CORE_LIBRARY
- INCLUDEPATH += $$PWD \