[oe-commits] org.oe.dev qt_staging.inc: substitute OE_QMAKE_LIBS_X11 in libtool files

[jeremy_laine commit]

qt_staging.inc: substitute OE_QMAKE_LIBS_X11 in libtool files

Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: 91ddf2b6b78a4ca6d53583160682f4bfd4f99089
ViewMTN: http://monotone.openembedded.org/revision/info/91ddf2b6b78a4ca6d53583160682f4bfd4f99089
Files:
1
packages/qt4/qt4-x11-free.inc
packages/qt4/qt_staging.inc
Diffs:

#
# mt diff -r4286bc9e6622ea47f8eb9882f7d1e610004e2d16 -r91ddf2b6b78a4ca6d53583160682f4bfd4f99089
#
#
#
# patch "packages/qt4/qt4-x11-free.inc"
#  from [89c46cc5b77c68a9396f847011f40dda890459a6]
#    to [6aa64a2bb7f36ee9fabfb827932d7b47dd9f2fd6]
# 
# patch "packages/qt4/qt_staging.inc"
#  from [f74af3775f1a2c2fb8670eca49ab7c2a89d91a53]
#    to [311fad49c6f57f9d909e3aa12a9f4635e194da20]
#
============================================================
--- packages/qt4/qt4-x11-free.inc	89c46cc5b77c68a9396f847011f40dda890459a6
+++ packages/qt4/qt4-x11-free.inc	6aa64a2bb7f36ee9fabfb827932d7b47dd9f2fd6
@@ -5,7 +5,7 @@ PROVIDES = "qt4x11"
 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 \
============================================================
--- packages/qt4/qt_staging.inc	f74af3775f1a2c2fb8670eca49ab7c2a89d91a53
+++ packages/qt4/qt_staging.inc	311fad49c6f57f9d909e3aa12a9f4635e194da20
@@ -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"