t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-02 11:02:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt5-creator: Fix build due to missing lrelease

Browse Source 
Fixes

make[2]:
/mnt/a/yoe/build/tmp/work/i586-yoe-linux-musl/qt5-creator/4.5.1-r0/recipe-sysroot/usr/bin/lrelease:
Command not found
make[2]: *** [Makefile:420: qtcreator_cs.qm] Error 127

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2018-09-25 12:26:22 -07:00
committed by Martin Jansa
parent 3ad2acb0e7
commit 333437ca8d
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
recipes-qt/qt5/qt5-creator/linguisttool.patch Normal file
View File

@@ -0,0 +1,23 @@
Remove path prefix so it can find these tools from buildhost or native packages
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: qt-creator-opensource-src-4.5.1/share/qtcreator/translations/translations.pro
===================================================================
--- qt-creator-opensource-src-4.5.1.orig/share/qtcreator/translations/translations.pro
+++ qt-creator-opensource-src-4.5.1/share/qtcreator/translations/translations.pro
@@ -12,10 +12,10 @@ defineReplace(prependAll) {
return($$result)
}
-XMLPATTERNS = $$shell_path($$[QT_INSTALL_BINS]/xmlpatterns)
-LUPDATE = $$shell_path($$[QT_INSTALL_BINS]/lupdate) -locations relative -no-ui-lines -no-sort
-LRELEASE = $$shell_path($$[QT_INSTALL_BINS]/lrelease)
-LCONVERT = $$shell_path($$[QT_INSTALL_BINS]/lconvert)
+XMLPATTERNS = $$OE_QMAKE_PATH_EXTERNAL_HOST_BINS/xmlpatterns
+LUPDATE = $$OE_QMAKE_PATH_EXTERNAL_HOST_BINS/lupdate -locations relative -no-ui-lines -no-sort
+LRELEASE = $$OE_QMAKE_PATH_EXTERNAL_HOST_BINS/lrelease
+LCONVERT = $$OE_QMAKE_PATH_EXTERNAL_HOST_BINS/lconvert
wd = $$replace(IDE_SOURCE_TREE, /, $$QMAKE_DIR_SEP)

5
recipes-qt/qt5/qt5-creator_4.5.1.bb
View File

@@ -23,6 +23,7 @@ SRC_URI = " \
http://download.qt.io/official_releases/qtcreator/4.5/${PV}/qt-creator-opensource-src-${PV}.tar.gz \
file://0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch \
file://botan-non-x86.patch \
file://linguisttool.patch \
file://qtcreator.desktop.in \
"
SRC_URI_append_libc-musl = " file://0002-Link-with-libexecinfo-on-musl.patch"
@@ -51,8 +52,8 @@ do_install() {
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.*
chrpath --delete ${D}${libdir}/${QT_DIR_NAME}/qtcreator/plugins/qmldesigner/libcomponentsplugin.so
chrpath --delete ${D}${libdir}/${QT_DIR_NAME}/qtcreator/plugins/qmldesigner/libqtquickplugin.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} += " \