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). (From OE-Core rev: b2e8cc5ae227656211fb7f32260e7dc4e2fb556e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
8609051d8d
commit
e6663ffa5f
|
@ -1,4 +1,5 @@
|
|||
DEPENDS_prepend = "${@["qt4-embedded ", ""][(d.getVar('PN', True)[:12] == 'qt4-embedded')]}"
|
||||
QT4EDEPENDS ?= "qt4-embedded "
|
||||
DEPENDS_prepend = "${QT4EDEPENDS}"
|
||||
|
||||
inherit qmake2
|
||||
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
DEPENDS_prepend = "${@base_contains("PROVIDES", "qt4-x11", "", "qt4-x11 ", d)}"
|
||||
QT4DEPENDS ?= "qt4-x11 "
|
||||
DEPENDS_prepend = "${QT4DEPENDS}"
|
||||
|
||||
inherit qmake2
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
Loading…
Reference in New Issue