[PATCH v3 0/1] Qt4: reduce build time

[PATCH v3 0/1] Qt4: reduce build time

[Anders Darander]

Reduce the build time of qt4-embedded.

V3: * Explicitly check if the phrasebook dir exists, instead of relying on a
    try-except clause that also would catch other errors.

V2 and earlier was a larger patch series. There were no modifications to this
patch in V2.

The following changes since commit 2e83e6755441cb14bd907d306974338c15173189:

  kernel: restore crtsavres.o to enable building external modules on powerpc (2011-08-17 15:46:16 +0100)

are available in the git repository at:
  git://github.com/darander/oe-core qt4-fixes
  https://github.com/darander/oe-core/tree/qt4-fixes

Anders Darander (1):
  qt4: allow a reduction in build time

 meta/recipes-qt/qt4/qt4.inc |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

-- 
1.7.5.4

[PATCH v3 1/1] qt4: allow a reduction in build time

[Anders Darander]

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.
* Check if the phrasebook path exists, and only then call do_split_packages()

Signed-off-by: Anders Darander <anders@chargestorm.se>
---
 meta/recipes-qt/qt4/qt4.inc |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 0410a92..5545be7 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -227,10 +227,11 @@ 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='' )
+        import os;
+        if os.path.exists(phrasebook_dir):
+                do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
  
         # Package all the plugins and their -dbg version and create a meta package
-        import os
         def qtopia_split(path, name, glob):
                 """
                 Split the package into a normal and -dbg package and then add the
@@ -278,11 +279,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 +320,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
 }
-- 
1.7.5.4

Re: [PATCH v3 0/1] Qt4: reduce build time

[Saul Wold]

On 08/17/2011 10:47 AM, Anders Darander wrote:
>
> Reduce the build time of qt4-embedded.
>
> V3: * Explicitly check if the phrasebook dir exists, instead of relying on a
>      try-except clause that also would catch other errors.
>
> V2 and earlier was a larger patch series. There were no modifications to this
> patch in V2.
>
> The following changes since commit 2e83e6755441cb14bd907d306974338c15173189:
>
>    kernel: restore crtsavres.o to enable building external modules on powerpc (2011-08-17 15:46:16 +0100)
>
> are available in the git repository at:
>    git://github.com/darander/oe-core qt4-fixes
>    https://github.com/darander/oe-core/tree/qt4-fixes
>
> Anders Darander (1):
>    qt4: allow a reduction in build time
>
>   meta/recipes-qt/qt4/qt4.inc |   13 +++++++------
>   1 files changed, 7 insertions(+), 6 deletions(-)
>
Merged into OE-Core

Thanks
	Sau!