From d9d07d41dbb403cc22271f6d066d61e77863cc84 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 5 Dec 2012 22:59:02 +0100 Subject: [PATCH] nativesdk-qt4-tools: fix do_configure to be reentrant * without = it can add g++ prefix multiple time when you reexecute do_configure (e.g. after failure) (From OE-Core rev: 4f891901bcf7be95cebca1a7296e7ea656adee74) Signed-off-by: Martin Jansa Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc index 85c7eab..5ed0e90 100644 --- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc +++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc @@ -63,8 +63,8 @@ do_configure() { if [ -f mkspecs/common/g++-base.conf ] ; then # don't use host g++ even during configure (4.8.0+) - sed -i -e "s#g++#${CXX}#" mkspecs/common/g++-base.conf - sed -i -e "s#gcc#${CC}#" mkspecs/common/g++-base.conf + sed -i -e "s#= g++#= ${CXX}#" mkspecs/common/g++-base.conf + sed -i -e "s#= gcc#= ${CC}#" mkspecs/common/g++-base.conf fi # Use qmake from qt4-native for building -- 2.7.4