Patchwork qt4-x11-free: depend on ICU

login
register
mail settings
Submitter Ross Burton
Date Nov. 29, 2013, 1:51 p.m.
Message ID <1385733065-13722-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/62613/
State Accepted
Commit ea03ed0e8da1110e5cd27365f7b1f3f071572d02
Headers show

Comments

Ross Burton - Nov. 29, 2013, 1:51 p.m.
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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-qt/qt4/qt4-x11-free.inc |    2 +-
 meta/recipes-qt/qt4/qt4.inc          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Paul Eggleton - Nov. 29, 2013, 2:47 p.m.
Hi Ross,

On Friday 29 November 2013 13:51:05 Ross Burton wrote:
> 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.
> 
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta/recipes-qt/qt4/qt4-x11-free.inc |    2 +-
>  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 369b3d5..46869aa 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
>  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 = ""
> 
> diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> index 293eb87..659561c 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 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} \

It seems like ICU might still have problems building for PowerPC. If that's 
the case, we should probably be explicitly disabling ICU for that 
architecture, right?

Cheers,
Paul
Ross Burton - Nov. 29, 2013, 8:10 p.m.
On 29 November 2013 14:47, Paul Eggleton <paul.eggleton@linux.intel.com> wrote:
> It seems like ICU might still have problems building for PowerPC. If that's
> the case, we should probably be explicitly disabling ICU for that
> architecture, right?

From discussion with Richard he reminded me that the problem is where
host and target endian are different, so this impacts more than just
PPC (and not all PPC machines).  A quick look at the ICU documentation
suggests that they have tooling in place for this so it's certainly
worth checking that this is still an issue.

That said, this is simply enforcing the behaviour that was pretty
consistent before as harfbuzz and beecrypt were both causing ICU to be
installed.

Ross
Otavio Salvador - Nov. 30, 2013, 9:48 p.m.
On Fri, Nov 29, 2013 at 6:10 PM, Burton, Ross <ross.burton@intel.com> wrote:
> On 29 November 2013 14:47, Paul Eggleton <paul.eggleton@linux.intel.com> wrote:
>> It seems like ICU might still have problems building for PowerPC. If that's
>> the case, we should probably be explicitly disabling ICU for that
>> architecture, right?
>
> From discussion with Richard he reminded me that the problem is where
> host and target endian are different, so this impacts more than just
> PPC (and not all PPC machines).  A quick look at the ICU documentation
> suggests that they have tooling in place for this so it's certainly
> worth checking that this is still an issue.
>
> That said, this is simply enforcing the behaviour that was pretty
> consistent before as harfbuzz and beecrypt were both causing ICU to be
> installed.

This should be backported to Dora so we don't have it floating there as well.

Patch

diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 369b3d5..46869aa 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
 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 = ""
 
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 293eb87..659561c 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
 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} \