aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2017-09-05 09:29:19 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-09-05 14:56:11 +0200
commitbe3c2d3e8c06528c20fa4511a75d649488a8c802 (patch)
tree19a8d314e5eb3da9ef158a7aae8105362691686e
parentec80b092470a8bc775c2d9dd6fa19827019190c1 (diff)
qtbase-native: set path to mkspec for cmake properly again
Since update to 5.9.2 native recipes in meta-qt5-extra fail due to strange path to mkspecs. This patch fixes this the hard way. Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb4
1 files changed, 4 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 5137deef..7e916dfd 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -118,6 +118,10 @@ do_install() {
fi
install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS}
+
+ # since 5.9.2 something sets a very strange path to mkspec ("${_qt5Core_install_prefix}/../../../../../../../../../../usr/lib/qt5//mkspecs/linux-oe-g++")
+ # override this until somebody finds a better way
+ echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
}
SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1"