diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-12-27 16:40:13 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-17 16:10:01 +0200 |
| commit | 2b5c531b22703025e67b2f207db91ea178f7ead5 (patch) | |
| tree | d83c755b2a31e0201cf3cecab7b34fc5c6c65a0d /recipes-qt/qt5/qt5.inc | |
| parent | eb1ad81906d8a40acb5a6691012d32772318433a (diff) | |
qtbase: don't touch STAGING and bypass sstate
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qt5.inc')
| -rw-r--r-- | recipes-qt/qt5/qt5.inc | 12 |
1 files changed, 12 insertions, 0 deletions
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 } |