From b5b71c557ff0dbc50ff57e73c556aec4ceff046d Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 10 Mar 2008 04:20:53 +0000 Subject: 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...) --- packages/qt4/qt_staging.inc | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'packages') 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} -- cgit v1.2.3 From 8a22fc8e84e37ac2990e1bbbd751740bde04dacd Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 10 Mar 2008 04:36:22 +0000 Subject: packages/qt4/qt_staging.inc: Remove the moc_location and uic_location completely from the .pc file For the staging area with sysroot there is no sane way to give the location of the command in a sane way. I'm not aware of any one using this to get the uic/moc binary, e.g. cmake is using qmake to query these pathes. --- packages/qt4/qt_staging.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc index f8f10de33c..1c3d69c1af 100644 --- a/packages/qt4/qt_staging.inc +++ b/packages/qt4/qt_staging.inc @@ -2,8 +2,8 @@ do_stage_append() { cd ${STAGING_LIBDIR}/pkgconfig sed -i s#"-L${S}/lib"##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#"moc_location=${STAGING_BINDIR}/moc4$"## Qt*.pc + sed -i s#"uic_location=${STAGING_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 -- cgit v1.2.3 From fbcc2a285efb50ec78d8257b6c22ee73174b4066 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 10 Mar 2008 06:28:17 +0000 Subject: packages/qt4/qt_packaging.inc: Clean the .pc and .la files to not point to STAGING_* Use some force to clean the installed .pc and .la files. --- packages/qt4/qt_packaging.inc | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'packages') diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index ba2a037f59..1b4faf97d2 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -177,6 +177,15 @@ do_install() { rm -rf ${D}/${bindir}/${QT_DIR_NAME} rm -rf ${D}/${datadir}/${QT_DIR_NAME}/mkspecs + # fix some .la and .pc files + sed -i s#"moc_location=${STAGING_BINDIR}/moc4$"#"moc_location=${bindir}/moc4"# ${D}/${libdir}/pkgconfig/Qt*.pc + sed -i s#"uic_location=${STAGING_BINDIR}/uic4$"#"uic_location=${bindir}/uic4"# ${D}/${libdir}/pkgconfig/Qt*.pc + sed -i s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g ${D}/${libdir}/pkgconfig/Qt*.pc + sed -i s#-L${STAGING_LIBDIR}##g ${D}${libdir}/pkgconfig/Qt*.pc + + sed -i s#-L${STAGING_LIBDIR}#-L${libdir}#g ${D}${libdir}/libQt*.la + sed -i s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g ${D}/${libdir}/libQt*.la + install -d ${D}/${libdir}/fonts touch ${D}/${libdir}/fonts/fontdir } -- cgit v1.2.3 From 587f9f658071292d11491ef26cb2d81f0e3c9e42 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 10 Mar 2008 09:07:25 +0000 Subject: Qt and QtopiaCore: Bump the PR on request due the staging fixes And the packaging of .la and .pc files changed so the PR bump is even a bit justified. --- packages/qt4/qt4-x11-free.inc | 2 +- packages/qt4/qtopia-core.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc index 5f672e6043..60c266bc73 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 = "r8" +PR = "r9" 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/qtopia-core.inc b/packages/qt4/qtopia-core.inc index e16bc23415..eab7e1b3e1 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 = "r2" +PR = "r3" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \ file://qconfig-oe.h \ -- cgit v1.2.3