sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #7 from levonmaa/master 

Fix up prl and pkgconfig file generation and paths for the qt.conf
This commit is contained in:
Otavio Salvador 2012-12-17 11:14:48 -08:00
parent 6b7dd87f92 34d4955894
commit 22b5908bfe
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/qmake5_base.bbclass
View File

@ -21,7 +21,7 @@ do_generate_qt_config_file() {
Binaries = ${bindir}
Headers = ${STAGING_INCDIR}/qt5
Plugins = ${libdir}/qt5/plugins
Libraries = ${libdir}
Libraries = ${STAGING_LIBDIR}
Imports = ${datadir}/qt5/imports
Qml2Imports = ${libdir}/qt5/qml
Documentation=${docdir}/qt5

5
recipes-qt/qt5/qtbase.inc
View File

@ -53,6 +53,11 @@ do_configure_append() {
${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/features/qt_installs.prf
rm -rf ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/modules*
### Fix up prl and pkgconfig lib paths, by default they will point to /usr/lib
${OE_QMAKE_QMAKE} -set OE_CROSS_INSTALL_LIBS ${STAGING_LIBDIR}
sed -i 's/QT_INSTALL_LIBS\/raw/OE_CROSS_INSTALL_LIBS/g' mkspecs/features/qt_module.prf
sed -i 's/QT_INSTALL_LIBS\/raw/OE_CROSS_INSTALL_LIBS/g' ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/features/qt_module.prf
### Remove the old pri files
rm ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/*.pri