diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-07-13 00:41:54 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-14 23:56:56 +0200 |
commit | 045e39b7d487733b03dc54590702e4c9373ed0f1 (patch) | |
tree | 39f136d236a60f751a8780d2fb35bad2997098e9 | |
parent | e1027a5e6044069c8d33caa7e42eb45107e8f753 (diff) | |
download | meta-qt5-045e39b7d487733b03dc54590702e4c9373ed0f1.tar.gz |
qt5-creator: Link with libexecinfo on musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | recipes-qt/qt5/qt5-creator/musl-backtrace.patch | 18 | ||||
-rw-r--r-- | recipes-qt/qt5/qt5-creator_3.5.1.bb | 6 |
2 files changed, 24 insertions, 0 deletions
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 00000000..fc7f86c2 --- /dev/null +++ b/recipes-qt/qt5/qt5-creator/musl-backtrace.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | Index: qt-creator-opensource-src-3.5.1/src/plugins/debugger/debugger.pro | ||
2 | =================================================================== | ||
3 | --- qt-creator-opensource-src-3.5.1.orig/src/plugins/debugger/debugger.pro | ||
4 | +++ qt-creator-opensource-src-3.5.1/src/plugins/debugger/debugger.pro | ||
5 | @@ -148,3 +148,4 @@ include(qml/qml.pri) | ||
6 | include(namedemangler/namedemangler.pri) | ||
7 | |||
8 | include(shared/shared.pri) | ||
9 | +LIBS *= -lexecinfo | ||
10 | Index: qt-creator-opensource-src-3.5.1/src/plugins/qmldesigner/config.pri | ||
11 | =================================================================== | ||
12 | --- qt-creator-opensource-src-3.5.1.orig/src/plugins/qmldesigner/config.pri | ||
13 | +++ qt-creator-opensource-src-3.5.1/src/plugins/qmldesigner/config.pri | ||
14 | @@ -9,3 +9,4 @@ equals(TMP_BAUHAUS_NO_OUTPUT, true):DEFI | ||
15 | DEFINES += ENABLE_TEXT_VIEW | ||
16 | |||
17 | isEmpty($$(BAUHAUS_OUTPUT_IN_TEST)):DEFINES += QDEBUG_IN_TESTS WARNINGS_IN_TESTS | ||
18 | +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 c85f38ce..786b2024 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 = " \ | |||
17 | inherit qmake5 | 17 | inherit qmake5 |
18 | 18 | ||
19 | DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg qtquick1" | 19 | DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg qtquick1" |
20 | DEPENDS_append_libc-musl = " libexecinfo" | ||
20 | 21 | ||
21 | SRC_URI = " \ | 22 | SRC_URI = " \ |
22 | http://download.qt.io/official_releases/qtcreator/3.5/${PV}/qt-creator-opensource-src-${PV}.tar.gz \ | 23 | http://download.qt.io/official_releases/qtcreator/3.5/${PV}/qt-creator-opensource-src-${PV}.tar.gz \ |
@@ -25,6 +26,10 @@ SRC_URI = " \ | |||
25 | file://0001-Qmlpuppet-add-missing-includes.patch \ | 26 | file://0001-Qmlpuppet-add-missing-includes.patch \ |
26 | file://qtcreator.desktop.in \ | 27 | file://qtcreator.desktop.in \ |
27 | " | 28 | " |
29 | |||
30 | SRC_URI_append_libc-musl = " file://musl-backtrace.patch " | ||
31 | |||
32 | |||
28 | SRC_URI[md5sum] = "77aef7df837eba07c7ce6037ee504c05" | 33 | SRC_URI[md5sum] = "77aef7df837eba07c7ce6037ee504c05" |
29 | SRC_URI[sha256sum] = "5925ac818a08be919094e0f28fb4c5d8896765e0975d54d353e4c50f13d63e65" | 34 | SRC_URI[sha256sum] = "5925ac818a08be919094e0f28fb4c5d8896765e0975d54d353e4c50f13d63e65" |
30 | 35 | ||
@@ -32,6 +37,7 @@ S = "${WORKDIR}/qt-creator-opensource-src-${PV}" | |||
32 | 37 | ||
33 | EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}" | 38 | EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}" |
34 | 39 | ||
40 | LDFLAGS_append_libc-musl = " -lexecinfo " | ||
35 | do_configure_append() { | 41 | do_configure_append() { |
36 | # Find native tools | 42 | # Find native tools |
37 | sed -i 's:${STAGING_BINDIR}.*/lrelease:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease:g' ${B}/share/qtcreator/translations/Makefile | 43 | sed -i 's:${STAGING_BINDIR}.*/lrelease:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease:g' ${B}/share/qtcreator/translations/Makefile |