Can't build qt4-x11-free

[Gary Thomas <gary@mlbassoc.com>]

| arm-poky-linux-gnueabi-g++  -march=armv5te  -marm -mthumb-interwork  -mtune=arm926ej-s --sysroot=/local/qemuarm_test/tmp/sysroots/qemuarm 
-Wl,-rpath-link,/local/qemuarm_test/tmp/sysroots/qemuarm/usr/lib -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed 
-Wl,-rpath-link,/local/qemuarm_test/tmp/work/armv5te-poky-linux-gnueabi/qt4-x11-free-4.8.1-r47.1/qt-everywhere-opensource-src-4.8.1/lib 
-Wl,-rpath-link,/local/qemuarm_test/tmp/work/armv5te-poky-linux-gnueabi/qt4-x11-free-4.8.1-r47.1/qt-everywhere-opensource-src-4.8.1/lib -shared -o libphonon_gstreamer.so 
.obj/release-shared/abstractrenderer.o .obj/release-shared/artssink.o .obj/release-shared/audioeffect.o .obj/release-shared/audiooutput.o .obj/release-shared/audiodataoutput.o 
.obj/release-shared/backend.o .obj/release-shared/devicemanager.o .obj/release-shared/effect.o .obj/release-shared/effectmanager.o .obj/release-shared/glrenderer.o 
.obj/release-shared/gsthelper.o .obj/release-shared/medianode.o .obj/release-shared/medianodeevent.o .obj/release-shared/mediaobject.o .obj/release-shared/message.o 
.obj/release-shared/phononsrc.o .obj/release-shared/qwidgetvideosink.o .obj/release-shared/streamreader.o .obj/release-shared/videowidget.o .obj/release-shared/volumefadereffect.o 
.obj/release-shared/widgetrenderer.o .obj/release-shared/x11renderer.o .obj/release-shared/moc_devicemanager.o .obj/release-shared/moc_effectmanager.o 
.obj/release-shared/moc_glrenderer.o   -L/local/qemuarm_test/tmp/sysroots/qemuarm/usr/lib 
-L/local/qemuarm_test/tmp/work/armv5te-poky-linux-gnueabi/qt4-x11-free-4.8.1-r47.1/qt-everywhere-opensource-src-4.8.1/lib -pthread -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 
-lgthread-2.0 -lrt -lxml2 -lgstinterfaces-0.10 -lgstvideo-0.10 -lgstbase-0.10 -lgstaudio-0.10 -L/local/qemuarm_test/tmp/sysroots/qemuarm/usr/lib -lphonon 
-L/local/qemuarm_test/tmp/work/armv5te-poky-linux-gnueabi/qt4-x11-free-4.8.1-r47.1/qt-everywhere-opensource-src-4.8.1/lib -lpulse-mainloop-glib -lpulse -lglib-2.0 -lQtDBus -lQtXml 
-lQtOpenGL -lQtGui -lQtCore -lGLU -lGL -lpthread
| /local/qemuarm_test/tmp/sysroots/i686-linux/usr/libexec/armv5te-poky-linux-gnueabi/gcc/arm-poky-linux-gnueabi/4.7.2/ld: cannot find -lGLU

This happens because of this commit:
$ git log meta/recipes-graphics/mesa/mesa-common.inc
commit 662a445b30af4d7538c3e7081dd9403acd006938
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Fri Oct 26 16:00:09 2012 +0100

     mesa: Build separate GLU library

     Mesa has removed GLU from the core tree upstream, so remove it from the
     Mesa build and add the separate tarball as a new recipe.

     (From OE-Core rev: 4395691a44b198ba0b9a969cbade669e8de07a4f)

     Signed-off-by: Daniel Stone <daniel@fooishbar.org>
     Signed-off-by: Ross Burton <ross.burton@intel.com>
     Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Adding 'libglu' to the DEPENDS in
   meta/recipes-qt/qt4/qt4-x11-free.inc:DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
fixes the build, but doesn't that doesn't seem quite right since currently
it's the mesa* recipe which forced this split, but some other instance
of virtual/libgl might not.

So, how do I best to fix the build with this new setup?

Thanks

-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------