qt5: Add mkspecs package and update FILES to package ${QT_DIR_NAME} directories

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

2 files changed, 23 insertions, 8 deletions

diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 0bfe1ad4..286f9188 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -82,14 +82,29 @@ do_install() {
     oe_runmake install INSTALL_ROOT=${D}
 }
 
-PACKAGES =. "${PN}-tools ${PN}-plugins ${PN}-plugins-dbg "
+PACKAGES =. "${PN}-tools ${PN}-plugins ${PN}-plugins-dbg ${PN}-mkspecs "
 FILES_${PN}-tools = "${bindir}/*"
 FILES_${PN}-plugins = "${libdir}/${QT_DIR_NAME}/plugins/*/*${SOLIBSDEV}"
 FILES_${PN}-plugins-dbg = "${libdir}/${QT_DIR_NAME}/plugins/*/.debug/*"
 
+FILES_${PN} += " \
+    ${libdir}/${QT_DIR_NAME}/lib*${SOLIBS} \
+"
 FILES_${PN}-dev += " \
-    ${libdir}/cmake/* \
-    ${libdir}/*.prl \
-    ${includedir}/qt5/* \
-    ${datadir}/qt5/* \
+    ${libdir}/${QT_DIR_NAME}/pkgconfig \
+    ${libdir}/${QT_DIR_NAME}/cmake/* \
+    ${libdir}/${QT_DIR_NAME}/*.prl \
+    ${libdir}/${QT_DIR_NAME}/*.la \
+    ${datadir}/${QT_DIR_NAME}/* \
+    ${includedir}/${QT_DIR_NAME}/* \
+"
+FILES_${PN}-dbg += " \
+    ${libdir}/${QT_DIR_NAME}/.debug \
+    ${libdir}/${QT_DIR_NAME}/lib*${SOLIBSDEV} \
+"
+FILES_${PN}-staticdev += " \
+    ${libdir}/${QT_DIR_NAME}/*.a \
+"
+FILES_${PN}-mkspecs += "\
+    ${libdir}/${QT_DIR_NAME}/mkspecs \
 "
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 1754a24e..2664d2cb 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -74,6 +74,7 @@ do_configure_append() {
         -importdir ${libdir}/${QT_DIR_NAME}/imports \
         -translationdir ${datadir}/${QT_DIR_NAME}/translations \
         -examplesdir ${bindir}/${QT_DIR_NAME}/examples \
+        -hostbindir ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME} \
         -external-hostbindir ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME} \
         -platform ${OE_QMAKESPEC} \
         -xplatform linux-oe-g++ \
@@ -105,6 +106,5 @@ do_install_append() {
     done
 }
 
-PACKAGES =. "${PN}-fonts ${PN}-mkspecs "
-FILES_${PN}-fonts = "${libdir}/fonts"
-FILES_${PN}-mkspecs = "${libdir}/${QT_DIR_NAME}/mkspecs"
+PACKAGES =. "${PN}-fonts "
+FILES_${PN}-fonts = "${libdir}/${QT_DIR_NAME}/fonts"