diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-07-20 18:12:24 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-07-25 12:14:11 +0200 |
commit | ca4a0758e17c69905df6eda86fe678a4f10f50f7 (patch) | |
tree | 588332f63d811744246c7c872216af0f1c0ed16d /classes | |
parent | ebd60ffe7e34f653532e30bfe1fad611a2b31384 (diff) |
qmake5_base: add override for HostLibraries
* qtdeclarative was using /usr/lib as HostLibraries causing
WARNING: QA Issue: qtdeclarative: The compile log indicates that host include and/or library paths were used.
Please check the log 'qtdeclarative/5.1.0-r0/temp/log.do_compile' for more information.
DEBUG 1: /OE/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib/qt5/mkspecs/features/qt_config.prf:23: QT_MODULE_HOST_LIB_BASE := /usr/lib
* also without this fix qtdeclarative and qtwayland are trying to
build tools against /usr/lib/libQt5Bootstrap.a (without sysroot
prefix)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'classes')
-rw-r--r-- | classes/qmake5_base.bbclass | 1 | ||||
-rw-r--r-- | classes/qmake5_paths.bbclass | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 8ff9565a..04518ef4 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -73,6 +73,7 @@ Examples = ${OE_QMAKE_PATH_EXAMPLES} Tests = ${OE_QMAKE_PATH_TESTS} HostBinaries = ${OE_QMAKE_PATH_HOST_BINS} HostData = ${OE_QMAKE_PATH_HOST_DATA} +HostLibraries = ${OE_QMAKE_PATH_HOST_LIBS} HostSpec = ${OE_QMAKESPEC} TartgetSpec = ${OE_XQMAKESPEC} ExternalHostBinaries = ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} diff --git a/classes/qmake5_paths.bbclass b/classes/qmake5_paths.bbclass index 67707add..8f1857f0 100644 --- a/classes/qmake5_paths.bbclass +++ b/classes/qmake5_paths.bbclass @@ -20,6 +20,7 @@ OE_QMAKE_PATH_TESTS = "${datadir}/tests" OE_QMAKE_PATH_HOST_PREFIX = "" OE_QMAKE_PATH_HOST_BINS = "${bindir}/${QT_DIR_NAME}" OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}" +OE_QMAKE_PATH_HOST_LIBS = "${STAGING_LIBDIR}" OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}" # for qt5 components we're using QT_DIR_NAME subdirectory in more |