From be3c2d3e8c06528c20fa4511a75d649488a8c802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 5 Sep 2017 09:29:19 +0200 Subject: qtbase-native: set path to mkspec for cmake properly again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native_git.bb | 4 ++++ 1 file changed, 4 insertions(+) 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" -- cgit v1.2.3