From ca4a0758e17c69905df6eda86fe678a4f10f50f7 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 20 Jul 2013 18:12:24 +0200 Subject: [PATCH] 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 --- classes/qmake5_base.bbclass | 1 + classes/qmake5_paths.bbclass | 1 + 2 files changed, 2 insertions(+) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 8ff9565abe..04518ef418 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 67707addda..8f1857f058 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