diff options
| author | Khem Raj <raj.khem@gmail.com> | 2018-09-27 18:01:46 -0700 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-30 16:02:19 +0000 |
| commit | 15a8c254c248104f8aa4a499f89fe78b763197f5 (patch) | |
| tree | 0411cfcd3b27d15c322f05015495e3e16fff9dc4 /recipes-qt/qt5/qt5-creator_git.bb | |
| parent | f11e9420e995a2aeb4ea308a45ddab09cb644a59 (diff) | |
qt5-creator: Pick native tools from native sysroot e.g. lrelease etc.
qtcreator's build system is not as creative when it comes to cross
building, it assumes to find some of tools used during translations to
be installed in bindir where its building on. In other words native
build is assumed. This patch helps the build system to locate the right
binaries during cross compilation
Fix install as we do not need chrpath'ing anymore
Fix cross-builds for non x86 systems
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qt5-creator_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qt5-creator_git.bb | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/recipes-qt/qt5/qt5-creator_git.bb b/recipes-qt/qt5/qt5-creator_git.bb index 218609bd..45e6d8ac 100644 --- a/recipes-qt/qt5/qt5-creator_git.bb +++ b/recipes-qt/qt5/qt5-creator_git.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ inherit qmake5 -DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native" +DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg" DEPENDS_append_libc-musl = " libexecinfo" SRCREV = "8768e39d3c8e74e583eca3897cc6de53a99c3dde" @@ -24,8 +24,8 @@ PV = "4.7.1+git${SRCPV}" # 4.7.1.meta-qt5.1 SRC_URI = " \ git://code.qt.io/qt-creator/qt-creator.git;branch=4.7 \ - file://0001-Use-correct-path-prefix.patch \ file://0002-botan.pro-pass-QMAKE_AR.patch \ + file://0001-botan-Always-define-BOTAN_ARCH_SWITCH-when-cross-bui.patch \ file://qtcreator.desktop.in \ " SRC_URI_append_libc-musl = " file://0003-Link-with-libexecinfo-on-musl.patch" @@ -34,25 +34,22 @@ S = "${WORKDIR}/git" EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}" -EXTRANATIVEPATH += "chrpath-native" - do_configure_append() { # Find native tools sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile + sed -i 's:${STAGING_BINDIR}.*/lrelease:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease:g' ${B}/share/qtcreator/translations/Makefile + sed -i 's:${STAGING_BINDIR}.*/lupdate:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lupdate:g' ${B}/share/qtcreator/translations/Makefile + sed -i 's:${STAGING_BINDIR}.*/xmlpatterns:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/xmlpatterns:g' ${B}/share/qtcreator/translations/Makefile + sed -i 's:${STAGING_BINDIR}.*/lconvert:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lconvert:g' ${B}/share/qtcreator/translations/Makefile + } do_install() { oe_runmake install INSTALL_ROOT=${D}${prefix} - oe_runmake install_inst_qch_docs INSTALL_ROOT=${D}${prefix} # install desktop and ensure that qt-creator finds qmake install -d ${D}${datadir}/applications install -m 0644 ${WORKDIR}/qtcreator.desktop.in ${D}${datadir}/applications/qtcreator.desktop sed -i 's:@QT5_QMAKE@:${OE_QMAKE_PATH_QT_BINS}:g' ${D}${datadir}/applications/qtcreator.desktop - chrpath --delete ${D}${libexecdir}/qtcreator/qtcreator_process_stub - chrpath --delete ${D}${libexecdir}/qtcreator/qbs_processlauncher - chrpath --delete ${D}${libdir}/${QT_DIR_NAME}/qtcreator/libqbscore.so.* - test -e ${D}${libdir}/${QT_DIR_NAME}/qtcreator/plugins/qmldesigner/libcomponentsplugin.so && chrpath --delete ${D}${libdir}/${QT_DIR_NAME}/qtcreator/plugins/qmldesigner/libcomponentsplugin.so - test -e ${D}${libdir}/${QT_DIR_NAME}/qtcreator/plugins/qmldesigner/libqtquickplugin.so && chrpath --delete ${D}${libdir}/${QT_DIR_NAME}/qtcreator/plugins/qmldesigner/libqtquickplugin.so } FILES_${PN} += " \ |