t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-17 20:51:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

qmake_base: remove QT_DIR_NAME from libdir

Browse Source 
* using ${libdir}/${QT_DIR_NAME} is causing pkgconfig files to be
  installed in this prefix too
* modify ArchData variable to move mkspecs files to qt5 prefix (so that
  they don't conflict with qt4)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2013-04-26 20:54:26 +02:00
parent 9b97567e9c
commit e89e33fd17
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
classes/qmake5_base.bbclass
View File

@@ -1,7 +1,7 @@
# This is useful for target recipes to reference native mkspecs
QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}/${QT_DIR_NAME}"
QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}"
QMAKE_MKSPEC_PATH = "${STAGING_LIBDIR}/${QT_DIR_NAME}"
QMAKE_MKSPEC_PATH = "${STAGING_LIBDIR}"
QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}"
# hardcode linux, because that's what 0001-Add-linux-oe-g-platform.patch adds
@@ -39,7 +39,7 @@ do_generate_qt_config_file() {
[Paths]
Prefix = ${prefix}
Binaries = ${bindir}/${QT_DIR_NAME}
Libraries = ${libdir}/${QT_DIR_NAME}
Libraries = ${libdir}
Headers = ${includedir}/${QT_DIR_NAME}
Data = ${datadir}/${QT_DIR_NAME}
ArchData = ${libdir}/${QT_DIR_NAME}