diff options
author | Jeremy Laine <jeremy.laine@m4x.org> | 2008-05-05 17:17:59 +0000 |
---|---|---|
committer | Jeremy Laine <jeremy.laine@m4x.org> | 2008-05-05 17:17:59 +0000 |
commit | badef3cb273d14dbfa46197dcdd99cd11a84d770 (patch) | |
tree | 45628389114e187016c61974295eec7d8723a04f | |
parent | 791b35b474ff387912e4dfc4b2536e08bc63142b (diff) |
qt_staging.inc: substitute OE_QMAKE_LIBS_X11 in libtool files
-rw-r--r-- | packages/qt4/qt4-x11-free.inc | 2 | ||||
-rw-r--r-- | packages/qt4/qt_staging.inc | 1 |
2 files changed, 2 insertions, 1 deletions
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" |