From: Björn Krombholz <pirobk@gmail.com>
Date: Sun, 19 Sep 2010 11:59:52 +0000 (+0000)
Subject: qt4-embedded: avoid circular dependencies for reciped providing qt4-embedded
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=224e98468078e9267b0b4c2d72bfb0eb3b2863ec;p=openembedded.git

qt4-embedded: avoid circular dependencies for reciped providing qt4-embedded

* 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>
---

diff --git a/classes/qt4e.bbclass b/classes/qt4e.bbclass
index f72e06b6eb..303b79b8a6 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"