From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Mon, 5 May 2008 17:17:59 +0000 (+0000)
Subject: qt_staging.inc: substitute OE_QMAKE_LIBS_X11 in libtool files
X-Git-Tag: Release-2010-05/1~7019^2~3^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=badef3cb273d14dbfa46197dcdd99cd11a84d770;p=openembedded.git

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 60c266bc73..17f2fff0fe 100644
--- 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 1c3d69c1af..a49be4757e 100644
--- 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"