diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-11-29 13:51:05 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-12 17:00:24 +0000 |
| commit | 84087e94cbb982b7dfd0d68bc74fff1534188558 (patch) | |
| tree | eeaaebbe54ea6b6e2804ca2e42fc366e7d704a3a /meta | |
| parent | e8aa4b57842d7e9a22d372fa0e295a895ae5428d (diff) | |
| download | poky-84087e94cbb982b7dfd0d68bc74fff1534188558.tar.gz | |
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>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index 369b3d5ae0..46869aa09f 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc | |||
| @@ -3,7 +3,7 @@ require qt4.inc | |||
| 3 | DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version." | 3 | DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version." |
| 4 | HOMEPAGE = "http://qt-project.org/" | 4 | HOMEPAGE = "http://qt-project.org/" |
| 5 | SECTION = "x11/libs" | 5 | SECTION = "x11/libs" |
| 6 | DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" | 6 | DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor icu" |
| 7 | PROVIDES += "qt4-x11" | 7 | PROVIDES += "qt4-x11" |
| 8 | QT4DEPENDS = "" | 8 | QT4DEPENDS = "" |
| 9 | 9 | ||
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 6adc4042c8..2944acf89f 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
| @@ -23,7 +23,7 @@ QT_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio | |||
| 23 | QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \ | 23 | QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \ |
| 24 | -shared -no-nas-sound -no-nis \ | 24 | -shared -no-nas-sound -no-nis \ |
| 25 | -system-libjpeg -system-libpng -system-libtiff -system-zlib \ | 25 | -system-libjpeg -system-libpng -system-libtiff -system-zlib \ |
| 26 | -no-pch -stl -glib \ | 26 | -no-pch -stl -glib -icu \ |
| 27 | -no-rpath -silent \ | 27 | -no-rpath -silent \ |
| 28 | ${QT_DBUS} \ | 28 | ${QT_DBUS} \ |
| 29 | ${QT_QT3SUPPORT} \ | 29 | ${QT_QT3SUPPORT} \ |