[OE-core] [PATCH 1/5] qt4: allow a reduction in build time

[Richard Purdie]

On Tue, 2011-08-16 at 15:57 +0200, 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 <anders at 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

Please use some actual test here, not a general try/except/pass. This
reason is that is some failure we want to know about happens, this will
hide it as the code stands.

The rest of the patch is ok, this just needs tweaking.

Cheers,

Richard