diff options
| author |   Richard Purdie <rpurdie@rpsys.net> | 2008-03-09 01:56:10 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2008-03-09 01:56:10 +0000 |
| commit | c1a5808565d5e6ccbe20ae36944c4f2c87eb77e8 (patch) | |
| tree | 21b2a1bf91a73bbdd5bc0e2a7194f32e8fbb9066 /packages/qt4 | |
| parent | 2e1b6a4f700fd55fae9d446a999cef530c2ddc6f (diff) | |
| download | openembedded-c1a5808565d5e6ccbe20ae36944c4f2c87eb77e8.tar.gz | |
qt4: Make sure staged .la and .prl files do not contain target system paths
Diffstat (limited to 'packages/qt4')
| -rw-r--r-- | packages/qt4/qt4-x11-free.inc | 2 | ||||
| -rw-r--r-- | packages/qt4/qt_staging.inc | 4 | ||||
| -rw-r--r-- | packages/qt4/qtopia-core.inc | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc index 2650433ec8..5f672e6043 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 = "r7" +PR = "r8" 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 9aa309d3af..ae12f0ebc7 100644 --- a/packages/qt4/qt_staging.inc +++ b/packages/qt4/qt_staging.inc @@ -23,6 +23,8 @@ do_stage() { for i in ${STAGE_TEMP}/${libdir}/*.la do sed -i s,installed=yes,installed=no, $i + sed -i -e "/^dependency_libs=/s,-L${libdir},-L${STAGING_LIBDIR},g" $i + sed -i -e "s,-L${libdir},-L${STAGING_LIBDIR},g" ${STAGE_TEMP}/${libdir}/$(basename $i .la).prl cp -fpPR $i ${STAGING_LIBDIR}/${QT_DIR_NAME}/ cp -fpPR ${STAGE_TEMP}/${libdir}/$(basename $i .la).prl ${STAGING_LIBDIR}/${QT_DIR_NAME} oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/${QT_DIR_NAME} @@ -30,7 +32,9 @@ do_stage() { for i in libQtAssistantClient${QT_LIBINFIX} libQtDesignerComponents${QT_LIBINFIX} libQtUiTools${QT_LIBINFIX} libQtUiTools${QT_LIBINFIX} libQtDesigner${QT_LIBINFIX} do + sed -i -e "s,-L${libdir},-L${STAGING_LIBDIR},g" $i.prl || true cp ${STAGE_TEMP}/${libdir}/$i.prl ${STAGING_LIBDIR}/${QT_DIR_NAME} || true + sed -i -e "/^dependency_libs=/s,-L${libdir},-L${STAGING_LIBDIR},g" $i.la || true cp ${STAGE_TEMP}/${libdir}/$i.la ${STAGING_LIBDIR}/${QT_DIR_NAME} || true oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $i ${STAGING_LIBDIR}/${QT_DIR_NAME} || true oe_libinstall -C ${STAGE_TEMP}/${libdir} -a $i ${STAGING_LIBDIR}/${QT_DIR_NAME} || true diff --git a/packages/qt4/qtopia-core.inc b/packages/qt4/qtopia-core.inc index 46bec73cd8..e16bc23415 100644 --- a/packages/qt4/qtopia-core.inc +++ b/packages/qt4/qtopia-core.inc @@ -4,7 +4,7 @@ LICENSE = "GPL" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" DEPENDS += "tslib" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \ file://qconfig-oe.h \ |