diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-02-16 15:03:49 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-02-21 12:56:06 +0000 |
| commit | d1ddf0cc4482b8e8e46f3be66870778ba9a42a13 (patch) | |
| tree | a3be687f016ffd7123ad2e0229f0f440dec9f0bc | |
| parent | 85e33e5c9998d15fc2af4682b72913bc2f6ea489 (diff) | |
qt5: fix qtenginio build error
bitbake meta-toolchain-qt5 command produces error for enginio module:
"QA Issue: Enginio.pc failed sanity test (tmpdir)".
- Modify sed command in qmake5_base.bbclass to include *.pc files
instead of Qt5*.pc, thus including Enginio.pc.
- Remove now obsolete install_append section from qtenginio_git.bb
Change-Id: Ia517f15104d242632408ec39f7826107dc3e93f6
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | classes/qmake5_base.bbclass | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtenginio_git.bb | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index a3d5cd03..3cd124ae 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -213,7 +213,7 @@ qmake5_base_do_install() { qmake5_base_fix_install ${STAGING_DIR_HOST} qmake5_base_fix_install ${STAGING_DIR_NATIVE} - if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>/dev/null; then + if ls ${D}${libdir}/pkgconfig/*.pc >/dev/null 2>/dev/null; then sed -i ${D}${libdir}/pkgconfig/*.pc \ -e "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" \ -e "s@${STAGING_DIR_TARGET}@@g" diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb index 2f32a884..8b4fb714 100644 --- a/recipes-qt/qt5/qtenginio_git.bb +++ b/recipes-qt/qt5/qtenginio_git.bb @@ -15,8 +15,3 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns" QT_MODULE_BRANCH = "dev" SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d" -do_install_append() { - if ls ${D}${libdir}/pkgconfig/Enginio.pc >/dev/null 2>/dev/null; then - sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/Enginio.pc - fi -} |