Change qmake.bbclass to support building native and nativesdk packages, so that qmake or qt5-module can be inherited and BBCLASSEXTEND used to create native and nativesdk packages.
qtxmlpatterns and qtdeclarative native and nativesdk modules are required for Qt Quick Compiler. Signed-off-by: Samuli Piippo <[email protected]> --- classes/qmake5.bbclass | 8 ++++++++ classes/qmake5_base.bbclass | 11 +++++++++++ recipes-qt/qt5/qt5.inc | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 ++ recipes-qt/qt5/qtxmlpatterns_git.bb | 2 ++ 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass index b056ea7..2b43f2e 100644 --- a/classes/qmake5.bbclass +++ b/classes/qmake5.bbclass @@ -13,3 +13,11 @@ do_configure() { do_install() { qmake5_base_do_install } + +do_install_class-native() { + qmake5_base_native_do_install +} + +do_install_class-nativesdk() { + qmake5_base_nativesdk_do_install +} diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 44575c4..ffb3103 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -166,6 +166,17 @@ qmake5_base_do_configure () { ${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} ${OE_QMAKE_RECURSIVE} $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling $CMD" } +qmake5_base_native_do_install() { + oe_runmake install INSTALL_ROOT=${D} +} + +qmake5_base_nativesdk_do_install() { + # Fix install paths for all + find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_HOST},(INSTALL_ROOT),g" + + oe_runmake install INSTALL_ROOT=${D} +} + qmake5_base_do_install() { # Fix install paths for all find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g" diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 8caaad3..36d77db 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -50,7 +50,7 @@ PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplu ALLOW_EMPTY_${PN} = "1" ALLOW_EMPTY_${PN}-dbg = "1" -RRECOMMENDS_${PN} = " \ +RRECOMMENDS_${PN}_class-target = " \ ${PN}-plugins \ ${PN}-qmlplugins \ " diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 9333016..d186705 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -28,3 +28,5 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" SRCREV = "2fdb6eba0a58b629db32f9eefec2f26df08d3d2e" + +BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 1be6853..da2255a 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -13,3 +13,5 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" SRCREV = "c21924d67a8ef39282afdf3ae6fef798dfca7135" + +BBCLASSEXTEND =+ "native nativesdk" -- 1.9.1 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
