[oe-commits] org.oe.dev packages/qt4/qt_staging.inc: No use for QT_DIR_NAME in the lib directory remove it
freyther commit
oe at amethyst.openembedded.net
Mon Mar 17 08:50:55 UTC 2008
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...)
Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 0cae5baef2348bca98b9a2a4f99adde516bc58a3
ViewMTN: http://monotone.openembedded.org/revision/info/0cae5baef2348bca98b9a2a4f99adde516bc58a3
Files:
1
packages/qt4/qt_staging.inc
Diffs:
#
# mt diff -rb1f799117e1773255381656617f8e8c465a06153 -r0cae5baef2348bca98b9a2a4f99adde516bc58a3
#
#
#
# patch "packages/qt4/qt_staging.inc"
# from [b81c5a4e9f78f1662d4253ad44815f912e81341c]
# to [18378f24f82591ca212595f5d66b0b7aef0077b6]
#
============================================================
--- packages/qt4/qt_staging.inc b81c5a4e9f78f1662d4253ad44815f912e81341c
+++ packages/qt4/qt_staging.inc 18378f24f82591ca212595f5d66b0b7aef0077b6
@@ -2,11 +2,12 @@ do_stage_append() {
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}
More information about the Openembedded-commits
mailing list