[OE-core] [PATCH] qt-4.8.1: Fix compile failures on qemux86

[Richard Purdie]

On Mon, 2012-04-30 at 20:53 +0200, Martin Jansa wrote:
> On Mon, Apr 30, 2012 at 07:34:58AM -0700, Khem Raj wrote:
> > On Mon, Apr 30, 2012 at 3:34 AM, Richard Purdie
> > <richard.purdie at linuxfoundation.org> wrote:
> > > Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> > > ---
> > > diff --git a/meta/recipes-qt/qt4/qt-4.8.1.inc b/meta/recipes-qt/qt4/qt-4.8.1.inc
> > > index b42ca01..8c38cae 100644
> > > --- a/meta/recipes-qt/qt4/qt-4.8.1.inc
> > > +++ b/meta/recipes-qt/qt4/qt-4.8.1.inc
> > > @@ -21,6 +21,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
> > >            file://g++.conf \
> > >            file://linux.conf \
> > >            file://gcc47-fix.patch \
> > > +           file://gcc47-fix2.patch \
> > >            file://disable-fuse-gold-flag.patch \
> > >            "
> > >
> > > diff --git a/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix2.patch b/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix2.patch
> > > new file mode 100644
> > > index 0000000..09513b6
> > > --- a/dev/null
> > > +++ b/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix2.patch
> > > @@ -0,0 +1,50 @@
> > > +Fixes for gcc 4.7.0, particularly on qemux86
> > > +
> > > +Origin: upstream, http://trac.webkit.org/changeset/93631
> > > +Origin: upstream, http://trac.webkit.org/changeset/113848
> > > +
> > > +Bug: https://bugs.webkit.org/show_bug.cgi?id=62168
> > > +Bug: https://bugs.webkit.org/show_bug.cgi?id=83584
> > > +
> > > +RP 2012/04/30
> > > +
> > > +Upstream-Status: Backport
> > > +
> > 
> > looks good. Are we able to build QT 4.8.x now
> 
> FWIW: with qemux86-64 and current gcc-4.7 I was able to build
> qt4-x11-free-4.8.1 even before this patch.

Right, but qemux86 failed. I'm not sure why the difference (different
error/warning flags?) but this patch does fix it.

Cheers,

Richard