aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Krombholz <pirobk@gmail.com>2010-09-19 11:59:52 +0000
committerKoen Kooi <koen@openembedded.org>2010-09-20 16:11:43 +0200
commit224e98468078e9267b0b4c2d72bfb0eb3b2863ec (patch)
tree35572a4cf98f06220a4c6f3dd697c309b2fbefc8
parent7f20d126527d6f1bdd0b3c744c053d2c0f467857 (diff)
downloadopenembedded-224e98468078e9267b0b4c2d72bfb0eb3b2863ec.zip
openembedded-224e98468078e9267b0b4c2d72bfb0eb3b2863ec.tar.gz
openembedded-224e98468078e9267b0b4c2d72bfb0eb3b2863ec.tar.bz2
qt4-embedded: avoid circular dependencies for reciped providing qt4-embeddedtesting_2010-09-20
* qt4e.bbclass did add a dependency on qt4-embedded for recipes providing qt4-embedded. This breaks building of qt4-embedded-gles in 2 ways: 1. PREFERRED_PROVIDER_qt4-embedded = qt4-embedded-gles adds a circular dependency. 2. bitbake qt4-embedded-gles first builds and installs qt4-embedded to sysroots/ and then fails to link the qt4-embedded-gles build against the libs in sysroots which don't provide the gl specific symbols * The fix avoids adding the dependency for package names _beginning_ with 'qt4-embedded' (as it is done in the x11 version). Signed-off-by: Koen Kooi <koen@openembedded.org>
-rw-r--r--classes/qt4e.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/qt4e.bbclass b/classes/qt4e.bbclass
index f72e06b..303b79b 100644
--- a/classes/qt4e.bbclass
+++ b/classes/qt4e.bbclass
@@ -1,4 +1,4 @@
-DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-embedded')]}"
+DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1)[:12] == 'qt4-embedded')]}"
inherit qmake2
QT_DIR_NAME = "qtopia"