[oe,meta-qt5,3/3] qt5-creator: Link with libexecinfo on musl

Message ID 20170713074154.10606-3-raj.khem@gmail.com
State New
Headers show
Series
  • [oe,meta-qt5,1/3] qtwebengine: Fix build on musl
Related show

Commit Message

Khem Raj July 13, 2017, 7:41 a.m.
Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 recipes-qt/qt5/qt5-creator/musl-backtrace.patch | 18 ++++++++++++++++++
 recipes-qt/qt5/qt5-creator_3.5.1.bb             |  6 ++++++
 2 files changed, 24 insertions(+)
 create mode 100644 recipes-qt/qt5/qt5-creator/musl-backtrace.patch

-- 
2.13.2

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/recipes-qt/qt5/qt5-creator/musl-backtrace.patch b/recipes-qt/qt5/qt5-creator/musl-backtrace.patch
new file mode 100644
index 0000000..fc7f86c
--- /dev/null
+++ b/recipes-qt/qt5/qt5-creator/musl-backtrace.patch
@@ -0,0 +1,18 @@ 
+Index: qt-creator-opensource-src-3.5.1/src/plugins/debugger/debugger.pro
+===================================================================
+--- qt-creator-opensource-src-3.5.1.orig/src/plugins/debugger/debugger.pro
++++ qt-creator-opensource-src-3.5.1/src/plugins/debugger/debugger.pro
+@@ -148,3 +148,4 @@ include(qml/qml.pri)
+ include(namedemangler/namedemangler.pri)
+ 
+ include(shared/shared.pri)
++LIBS  *= -lexecinfo
+Index: qt-creator-opensource-src-3.5.1/src/plugins/qmldesigner/config.pri
+===================================================================
+--- qt-creator-opensource-src-3.5.1.orig/src/plugins/qmldesigner/config.pri
++++ qt-creator-opensource-src-3.5.1/src/plugins/qmldesigner/config.pri
+@@ -9,3 +9,4 @@ equals(TMP_BAUHAUS_NO_OUTPUT, true):DEFI
+ DEFINES += ENABLE_TEXT_VIEW
+ 
+ isEmpty($$(BAUHAUS_OUTPUT_IN_TEST)):DEFINES += QDEBUG_IN_TESTS WARNINGS_IN_TESTS
++LIBS  *= -lexecinfo
diff --git a/recipes-qt/qt5/qt5-creator_3.5.1.bb b/recipes-qt/qt5/qt5-creator_3.5.1.bb
index c85f38c..786b202 100644
--- a/recipes-qt/qt5/qt5-creator_3.5.1.bb
+++ b/recipes-qt/qt5/qt5-creator_3.5.1.bb
@@ -17,6 +17,7 @@  LIC_FILES_CHKSUM = " \
 inherit qmake5
 
 DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg qtquick1"
+DEPENDS_append_libc-musl = " libexecinfo"
 
 SRC_URI = " \
     http://download.qt.io/official_releases/qtcreator/3.5/${PV}/qt-creator-opensource-src-${PV}.tar.gz \
@@ -25,6 +26,10 @@  SRC_URI = " \
     file://0001-Qmlpuppet-add-missing-includes.patch \
     file://qtcreator.desktop.in \
 "
+
+SRC_URI_append_libc-musl = " file://musl-backtrace.patch "
+
+
 SRC_URI[md5sum] = "77aef7df837eba07c7ce6037ee504c05"
 SRC_URI[sha256sum] = "5925ac818a08be919094e0f28fb4c5d8896765e0975d54d353e4c50f13d63e65"
 
@@ -32,6 +37,7 @@  S = "${WORKDIR}/qt-creator-opensource-src-${PV}"
 
 EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}"
 
+LDFLAGS_append_libc-musl = " -lexecinfo "
 do_configure_append() {
     # Find native tools
     sed -i 's:${STAGING_BINDIR}.*/lrelease:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease:g' ${B}/share/qtcreator/translations/Makefile