summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--classes/qmake5_base.bbclass2
-rw-r--r--recipes-qt/qt5/qtenginio_git.bb5
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() {
213 qmake5_base_fix_install ${STAGING_DIR_HOST} 213 qmake5_base_fix_install ${STAGING_DIR_HOST}
214 qmake5_base_fix_install ${STAGING_DIR_NATIVE} 214 qmake5_base_fix_install ${STAGING_DIR_NATIVE}
215 215
216 if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>/dev/null; then 216 if ls ${D}${libdir}/pkgconfig/*.pc >/dev/null 2>/dev/null; then
217 sed -i ${D}${libdir}/pkgconfig/*.pc \ 217 sed -i ${D}${libdir}/pkgconfig/*.pc \
218 -e "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" \ 218 -e "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" \
219 -e "s@${STAGING_DIR_TARGET}@@g" 219 -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"
15QT_MODULE_BRANCH = "dev" 15QT_MODULE_BRANCH = "dev"
16SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d" 16SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d"
17 17
18do_install_append() {
19 if ls ${D}${libdir}/pkgconfig/Enginio.pc >/dev/null 2>/dev/null; then
20 sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/Enginio.pc
21 fi
22}