qt4: Avoid circular dependencies with multilib

Without this, circular dependencies are found when attempting to build
multilib versions of qt4 (or bitbake world in a multilib enabled build).

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/qt4e.bbclass b/meta/classes/qt4e.bbclass
index 05c24efaa12cbeebee615431df03631484e952ef..de2a68d25b61d769cfda282e6cc383219e7799e5 100644 (file)
--- a/meta/classes/qt4e.bbclass
+++ b/meta/classes/qt4e.bbclass
@@ -1,4 +1,5 @@
-DEPENDS_prepend = "${@["qt4-embedded ", ""][(d.getVar('PN', True)[:12] == 'qt4-embedded')]}"
+QT4EDEPENDS ?= "qt4-embedded "
+DEPENDS_prepend = "${QT4EDEPENDS}"
 
 inherit qmake2
 

diff --git a/meta/classes/qt4x11.bbclass b/meta/classes/qt4x11.bbclass
index 52190f45c184bb1666b71e1d30a1201e9d580c20..b06e15d29e7321a1c328a3c123dd6e4019d929d2 100644 (file)
--- a/meta/classes/qt4x11.bbclass
+++ b/meta/classes/qt4x11.bbclass
@@ -1,4 +1,5 @@
-DEPENDS_prepend = "${@base_contains("PROVIDES", "qt4-x11", "", "qt4-x11 ", d)}"
+QT4DEPENDS ?= "qt4-x11 "
+DEPENDS_prepend = "${QT4DEPENDS}"
 
 inherit qmake2
 

diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index c0606342331faafc8f28090a75c5dc55502a98b2..905e2779bb17e796bcdbe34dff3e6e7aafd8ab72 100644 (file)
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -4,6 +4,7 @@ HOMEPAGE = "http://qt.nokia.com"
 DEPENDS += "directfb tslib"
 INC_PR = "r49"
 
+QT4EDEPENDS = ""
 QT_BASE_LIB  ?= "libqt-embedded"
 
 # Set necessary variables in the profile

diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 68b30789bf3eda642832b9dc05ba69189534ddfe..404d8b85631bd956d6efce02d70d8c76532b1fd5 100644 (file)
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,6 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
 SECTION = "x11/libs"
 DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
 PROVIDES += "qt4-x11"
+QT4DEPENDS = ""
 
 INC_PR = "r47"