diff options
| author | Holger Freyther <zecke@selfish.org> | 2008-03-10 04:20:53 +0000 |
|---|---|---|
| committer | Holger Freyther <zecke@selfish.org> | 2008-03-10 04:20:53 +0000 |
| commit | b5b71c557ff0dbc50ff57e73c556aec4ceff046d (patch) | |
| tree | 12f2ac523b442a312626544dc1fc14f7c99ffed6 /packages | |
| parent | cd8f5864165e6b21ababce7efa931c81d8464d32 (diff) | |
packages/qt4/qt_staging.inc: No use for QT_DIR_NAME in the lib directory remove it
-Remove QT_DIR_NAME from the staging
-Make uic/moc lines in pc files not point to $STAGING_BINDIR (in there due mtn...)
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/qt4/qt_staging.inc | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc index ae12f0ebc7..f8f10de33c 100644 --- a/packages/qt4/qt_staging.inc +++ b/packages/qt4/qt_staging.inc @@ -2,11 +2,12 @@ do_stage_append() { cd ${STAGING_LIBDIR}/pkgconfig sed -i s#"-L${S}/lib"##g Qt*.pc - sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# Qt*.pc - sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# Qt*.pc - sed -i s#libdir=\$\{prefix\}/lib#libdir=\$\{prefix\}/lib/${QT_DIR_NAME}#g Qt*.pc + sed -i s#"moc_location=${STAGING_BINDIR}/moc4"#moc_location=${layout_bindir}/moc4# Qt*.pc + sed -i s#"uic_location=${STAGING_BINDIR}/uic4"#uic_location=${layout_bindir}/uic4# Qt*.pc + sed -i s#"-L${STAGING_LIBDIR}"##g Qt*.pc + sed -i s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g Qt*.pc - cd ${STAGING_LIBDIR}/${QT_DIR_NAME} + cd ${STAGING_LIBDIR} sed -i s#"-L${S}/lib"##g libQt*.la } @@ -17,7 +18,7 @@ do_stage() { oe_runmake install INSTALL_ROOT=${STAGE_TEMP} install -d ${STAGING_INCDIR}/ - install -d ${STAGING_LIBDIR}/${QT_DIR_NAME} + install -d ${STAGING_LIBDIR} cp -pPRf ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/ for i in ${STAGE_TEMP}/${libdir}/*.la @@ -25,19 +26,19 @@ do_stage() { 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} + cp -fpPR $i ${STAGING_LIBDIR} + cp -fpPR ${STAGE_TEMP}/${libdir}/$(basename $i .la).prl ${STAGING_LIBDIR} + oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR} done 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 + cp ${STAGE_TEMP}/${libdir}/$i.prl ${STAGING_LIBDIR} || 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 + cp ${STAGE_TEMP}/${libdir}/$i.la ${STAGING_LIBDIR} || true + oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $i ${STAGING_LIBDIR} || true + oe_libinstall -C ${STAGE_TEMP}/${libdir} -a $i ${STAGING_LIBDIR} || true done rm -rf ${STAGE_TEMP} |