diff options
| -rw-r--r-- | packages/qt4/qt_packaging.inc | 2 | ||||
| -rw-r--r-- | packages/qt4/qt_staging.inc | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index e610245c05..63d314c6c5 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -1,4 +1,4 @@ -NONDEV_PACKAGES = "${QT_BASE_LIB}core4 ${QT_BASE_LIB}gui4 ${QT_BASE_LIB}network4 \ +NONDEV_PACKAGES += "${QT_BASE_LIB}core4 ${QT_BASE_LIB}gui4 ${QT_BASE_LIB}network4 \ ${QT_BASE_LIB}sql4 ${QT_BASE_LIB}svg4 ${QT_BASE_LIB}test4 ${QT_BASE_LIB}xml4 \ ${QT_BASE_LIB}designer4 ${QT_BASE_LIB}designercomponents4 \ ${QT_BASE_LIB}3support4 ${QT_BASE_LIB}assistantclient4 ${QT_BASE_LIB}script4 \ diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc index ddc28720a3..9aa309d3af 100644 --- a/packages/qt4/qt_staging.inc +++ b/packages/qt4/qt_staging.inc @@ -4,6 +4,10 @@ do_stage_append() { 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 + + cd ${STAGING_LIBDIR}/${QT_DIR_NAME} + sed -i s#"-L${S}/lib"##g libQt*.la } STAGE_TEMP = "${WORKDIR}/temp-staging" |