mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-16 18:49:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt4: Avoid circular dependencies with multilib

Browse Source 
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:
Richard Purdie
2012-10-02 23:26:09 +01:00
parent 8609051d8d
commit e6663ffa5f
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
meta/classes/qt4e.bbclass
View File

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

3
meta/classes/qt4x11.bbclass
View File

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

1
meta/recipes-qt/qt4/qt4-embedded.inc
View File

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

1
meta/recipes-qt/qt4/qt4-x11-free.inc
View File

@@ -5,6 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
SECTION = "x11/libs" SECTION = "x11/libs"
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
PROVIDES += "qt4-x11" PROVIDES += "qt4-x11"
QT4DEPENDS = ""
INC_PR = "r47" INC_PR = "r47"