From b2e8cc5ae227656211fb7f32260e7dc4e2fb556e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 2 Oct 2012 23:26:09 +0100 Subject: 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 --- meta/classes/qt4e.bbclass | 3 ++- meta/classes/qt4x11.bbclass | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/qt4e.bbclass b/meta/classes/qt4e.bbclass index 05c24efaa1..de2a68d25b 100644 --- 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 52190f45c1..b06e15d29e 100644 --- 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 -- cgit 1.2.3-korg