summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-qt/qt5/qt5-creator_4.5.1.bb7
1 files changed, 6 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qt5-creator_4.5.1.bb b/recipes-qt/qt5/qt5-creator_4.5.1.bb
index 6eaf785f..4c26ac49 100644
--- a/recipes-qt/qt5/qt5-creator_4.5.1.bb
+++ b/recipes-qt/qt5/qt5-creator_4.5.1.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \
14 14
15inherit qmake5 15inherit qmake5
16 16
17DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg" 17DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native"
18DEPENDS_append_libc-musl = " libexecinfo" 18DEPENDS_append_libc-musl = " libexecinfo"
19 19
20# Patches from https://github.com/meta-qt5/qtcreator/commits/b5.4.1 20# Patches from https://github.com/meta-qt5/qtcreator/commits/b5.4.1
@@ -34,6 +34,8 @@ S = "${WORKDIR}/qt-creator-opensource-src-${PV}"
34 34
35EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}" 35EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}"
36 36
37EXTRANATIVEPATH += "chrpath-native"
38
37do_configure_append() { 39do_configure_append() {
38 # Find native tools 40 # Find native tools
39 sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile 41 sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile
@@ -46,6 +48,9 @@ do_install() {
46 install -d ${D}${datadir}/applications 48 install -d ${D}${datadir}/applications
47 install -m 0644 ${WORKDIR}/qtcreator.desktop.in ${D}${datadir}/applications/qtcreator.desktop 49 install -m 0644 ${WORKDIR}/qtcreator.desktop.in ${D}${datadir}/applications/qtcreator.desktop
48 sed -i 's:@QT5_QMAKE@:${OE_QMAKE_PATH_QT_BINS}:g' ${D}${datadir}/applications/qtcreator.desktop 50 sed -i 's:@QT5_QMAKE@:${OE_QMAKE_PATH_QT_BINS}:g' ${D}${datadir}/applications/qtcreator.desktop
51 chrpath --delete ${D}${libexecdir}/qtcreator/qtcreator_process_stub
52 chrpath --delete ${D}${libexecdir}/qtcreator/qbs_processlauncher
53 chrpath --delete ${D}${libdir}/qt5/qtcreator/libqbscore.so.*
49} 54}
50 55
51FILES_${PN} += " \ 56FILES_${PN} += " \