From c86fb1727ae09526c442ec29fffde3f010aa70eb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 3 Oct 2012 08:55:10 +0000 Subject: qt3: Avoid circular dependencies with multilib Without this, circular dependecies are found when attempting to build multilib versions of qt3 (or bitbake world in a multilib enabled build). Signed-off-by: Richard Purdie --- classes/qt3x11.bbclass | 3 ++- recipes-qt3/qt3/qt-x11-free-common.inc | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass index 79664f2..c537c36 100644 --- a/classes/qt3x11.bbclass +++ b/classes/qt3x11.bbclass @@ -1,4 +1,5 @@ -DEPENDS_prepend = "${@["qt3x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt-x11-free')]}" +QT3DEPENDS ?= "qt3x11" +DEPENDS_prepend = "${QT3DEPENDS}" EXTRA_QMAKEVARS_POST += "CONFIG+=thread" # # override variables set by qmake_base to compile Qt/X11 apps diff --git a/recipes-qt3/qt3/qt-x11-free-common.inc b/recipes-qt3/qt3/qt-x11-free-common.inc index 1ab14a2..ce00442 100644 --- a/recipes-qt3/qt3/qt-x11-free-common.inc +++ b/recipes-qt3/qt3/qt-x11-free-common.inc @@ -6,6 +6,7 @@ INC_PR = "r6" S = "${WORKDIR}/qt-x11-free-${PV}" +QT3DEPENDS = "" inherit qmake_base qt3x11 -- cgit v1.2.3-54-g00ecf