sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

qt4-x11-free: depend on ICU 

ICU presence is auto-detected at configure time and until recently (e68850 and
d61230) was pulled into most builds through harfbuzz and beecrypt.  Now it's
floating and this leads to build failures.

As in all likelihood the majority of people were building this with ICU enabled,
add an explicit dependency.

(From OE-Core master rev: 46dcec6fd455584d9b5d0d7ff1e5b36fbe5a2d62)

(From OE-Core rev: 034d3e35cce9ee63f6139d19be9b3edec4f97a64)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton 2013-11-29 13:51:05 +00:00 committed by Richard Purdie
parent e8aa4b5784
commit 84087e94cb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@ require qt4.inc
DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version."
HOMEPAGE = "http://qt-project.org/"
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 icu"
PROVIDES += "qt4-x11"
QT4DEPENDS = ""

2
meta/recipes-qt/qt4/qt4.inc
View File

@ -23,7 +23,7 @@ QT_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio
QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
-shared -no-nas-sound -no-nis \
-system-libjpeg -system-libpng -system-libtiff -system-zlib \
-no-pch -stl -glib \
-no-pch -stl -glib -icu \
-no-rpath -silent \
${QT_DBUS} \
${QT_QT3SUPPORT} \