summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorAnders Darander <anders@chargestorm.se>2011-08-17 17:47:51 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-19 16:29:18 (GMT)
commit5f32d1fcc5b75ea6dd7e59a4b258a45418c71263 (patch)
tree4fd75730fec59827c5c73f3588877e27c948e57a /meta/recipes-qt
parente043c9d1ce56dfa35d4d31454af303f9d482ec3c (diff)
downloadpoky-5f32d1fcc5b75ea6dd7e59a4b258a45418c71263.tar.gz
qt4: allow a reduction in build time
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() (From OE-Core rev: 51ef8335df895603e75345a18aaefe2359b2387f) Signed-off-by: Anders Darander <anders@chargestorm.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4.inc13
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() {
227 227
228 phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d) 228 phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d)
229 phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d) 229 phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d)
230 do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' ) 230 import os;
231 if os.path.exists(phrasebook_dir):
232 do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
231 233
232 # Package all the plugins and their -dbg version and create a meta package 234 # Package all the plugins and their -dbg version and create a meta package
233 import os
234 def qtopia_split(path, name, glob): 235 def qtopia_split(path, name, glob):
235 """ 236 """
236 Split the package into a normal and -dbg package and then add the 237 Split the package into a normal and -dbg package and then add the
@@ -278,11 +279,11 @@ do_install() {
278 279
279 # These are host binaries, we should only use them in staging 280 # These are host binaries, we should only use them in staging
280 rm ${D}/${bindir}/qmake 281 rm ${D}/${bindir}/qmake
281 rm ${D}/${bindir}/uic 282 rm -f ${D}/${bindir}/uic
282 rm ${D}/${bindir}/uic3 283 rm -f ${D}/${bindir}/uic3
283 rm ${D}/${bindir}/moc 284 rm ${D}/${bindir}/moc
284 rm ${D}/${bindir}/rcc 285 rm ${D}/${bindir}/rcc
285 rm ${D}/${bindir}/lrelease 286 rm -f ${D}/${bindir}/lrelease
286 287
287 # fix pkgconfig, libtool and prl files 288 # fix pkgconfig, libtool and prl files
288 sed -i -e s#-L${S}/lib##g \ 289 sed -i -e s#-L${S}/lib##g \
@@ -319,6 +320,6 @@ do_install() {
319 320
320 #Append an E to the qtdemo file 321 #Append an E to the qtdemo file
321 if [ -n "${QT_LIBINFIX}" ] ; then 322 if [ -n "${QT_LIBINFIX}" ] ; then
322 mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX} 323 [ -f ${D}${bindir}/qtdemo ] && mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
323 fi 324 fi
324} 325}