qt_staging.inc: substitute OE_QMAKE_LIBS_X11 in libtool files

diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc
index 60c266bc731c2cfc37df329b43a4c26427d0e957..17f2fff0fe4ad128ec88fd4994f5053934305ff4 100644 (file)
--- a/packages/qt4/qt4-x11-free.inc
+++ b/packages/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com"
 LICENSE = "GPL QPL"
 DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor"
 PROVIDES = "qt4x11"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
            file://0001-cross-compile.patch;patch=1 \

diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc
index 1c3d69c1afae86058d1ab99952838689e30fd109..a49be4757e72ee709468e12e097f7c26addb44e0 100644 (file)
--- a/packages/qt4/qt_staging.inc
+++ b/packages/qt4/qt_staging.inc
@@ -9,6 +9,7 @@ do_stage_append() {
 
     cd ${STAGING_LIBDIR}
     sed -i s#"-L${S}/lib"##g libQt*.la
+    sed -i s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g libQt*.la
 }
 
 STAGE_TEMP = "${WORKDIR}/temp-staging"