On Tuesday 16 August 2011 14:57:48 Anders Darander wrote:
> When reducing build time by adding QT_DISTRO_FLAGS from the set '-no-gui
> -nomake tools -nomake examples -nomake demos -nomake docs', build failure
> can occur, due to not building all tools.
>
> * Make rm not error out when removing one of the, possibly, non-existing
> tools. * Only try to rename qtdemo, if qtdemo exists.
> * Guard do_split_packages() with an try-except-clause, otherwise we get an
> error stating that .../phrasebooks/... do not exist.
>
> Signed-off-by: Anders Darander <and...@chargestorm.se>
> ---
> meta/recipes-qt/qt4/qt4.inc | 13 ++++++++-----
> 1 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> index 0410a92..994ec12 100644
> --- a/meta/recipes-qt/qt4/qt4.inc
> +++ b/meta/recipes-qt/qt4/qt4.inc
> @@ -227,7 +227,10 @@ python populate_packages_prepend() {
>
> phrasebook_dir =
> bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d)
> phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d) -
> do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name,
> '${PN} phrasebook for %s', extra_depends='' ) + try:
> + do_split_packages(d, phrasebook_dir, '^(.*)\.qph$',
> phrasebook_name, '${PN} phrasebook for %s', extra_depends='' ) +
> except:
> + pass
>
> # Package all the plugins and their -dbg version and create a meta
> package import os
> @@ -278,11 +281,11 @@ do_install() {
>
> # These are host binaries, we should only use them in staging
> rm ${D}/${bindir}/qmake
> - rm ${D}/${bindir}/uic
> - rm ${D}/${bindir}/uic3
> + rm -f ${D}/${bindir}/uic
> + rm -f ${D}/${bindir}/uic3
> rm ${D}/${bindir}/moc
> rm ${D}/${bindir}/rcc
> - rm ${D}/${bindir}/lrelease
> + rm -f ${D}/${bindir}/lrelease
>
> # fix pkgconfig, libtool and prl files
> sed -i -e s#-L${S}/lib##g \
> @@ -319,6 +322,6 @@ do_install() {
>
> #Append an E to the qtdemo file
> if [ -n "${QT_LIBINFIX}" ] ; then
> - mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
> + [ -f ${D}${bindir}/qtdemo ] && mv ${D}${bindir}/qtdemo
> ${D}${bindir}/qtdemo${QT_LIBINFIX} fi
> }
Acked-by: Paul Eggleton <paul.eggle...@linux.intel.com>
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
