From 2b5c531b22703025e67b2f207db91ea178f7ead5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 27 Dec 2012 16:40:13 +0100 Subject: qtbase: don't touch STAGING and bypass sstate Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5.inc | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'recipes-qt/qt5/qt5.inc') diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 8d5dd81e..8ed4c288 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -62,6 +62,18 @@ do_configure() { ln -sf ${OE_QMAKE_QMAKE} bin/qmake fi + if [ ! -e mkspecs/${TARGET_OS}-oe-g++ ]; then + ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++ + fi + + if [ -f mkspecs/common/g++-unix.conf ] ; then + # mkspecs were refactored for 4.8.0 + cp -f ${WORKDIR}/g++.conf mkspecs/common/g++-unix.conf + else + cp -f ${WORKDIR}/g++.conf mkspecs/common/g++.conf + fi + cp -f ${WORKDIR}/linux.conf mkspecs/common/ + # Avoid problems with the linkers, since we want the linker to be g++ unset LD } -- cgit v1.2.3