qt4: Avoid circular dependencies with multilib

PATCH New Richard Purdie 1 participant 1 message Oct 2, 2012

Share & tools

Richard Purdie

author

2012-10-02 22:39 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---

meta/classes/qt4e.bbclass +2 -1

index 05c24ef..de2a68d 100644
@@ -1,4 +1,5 @@
-DEPENDS_prepend = "${@["qt4-embedded ", ""][(d.getVar('PN', True)[:12] == 'qt4-embedded')]}"
+QT4EDEPENDS ?= "qt4-embedded "
+DEPENDS_prepend = "${QT4EDEPENDS}"
 
 inherit qmake2

meta/classes/qt4x11.bbclass +2 -1

index 52190f4..b06e15d 100644
@@ -1,4 +1,5 @@
-DEPENDS_prepend = "${@base_contains("PROVIDES", "qt4-x11", "", "qt4-x11 ", d)}"
+QT4DEPENDS ?= "qt4-x11 "
+DEPENDS_prepend = "${QT4DEPENDS}"
 
 inherit qmake2

meta/recipes-qt/qt4/qt4-embedded.inc +1 -0

index 53eb652..965c66e 100644
@@ -4,6 +4,7 @@ HOMEPAGE = "http://qt.nokia.com"
 DEPENDS += "directfb tslib"
 INC_PR = "r48"
 
+QT4EDEPENDS = ""
 QT_BASE_LIB  ?= "libqt-embedded"
 
 # Set necessary variables in the profile

meta/recipes-qt/qt4/qt4-x11-free.inc +1 -0

index 0ae74f7..70ee9b0 100644
@@ -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 = "r46"