diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-03 08:55:10 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-03 08:55:38 +0000 |
| commit | c86fb1727ae09526c442ec29fffde3f010aa70eb (patch) | |
| tree | 358ce70d9a3ba00123c1449862ae1a28aa64fb0c | |
| parent | 8730326c902e6fb256b5dea77a6dde28d813c424 (diff) | |
| download | meta-qt3-1.3.2.tar.gz meta-qt3-1.3.2.tar.bz2 meta-qt3-1.3.2.zip | |
qt3: Avoid circular dependencies with multilibdanny-8.0.2danny-8.0.11.3_M5.rc41.3_M5.rc31.3.2.final1.3.21.3danny
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 <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | classes/qt3x11.bbclass | 3 | ||||
| -rw-r--r-- | recipes-qt3/qt3/qt-x11-free-common.inc | 1 |
2 files changed, 3 insertions, 1 deletions
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 |