[oe-commits] Martin Jansa : nativesdk-qt4-tools: fix do_configure to be reentrant

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 4f891901bcf7be95cebca1a7296e7ea656adee74
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4f891901bcf7be95cebca1a7296e7ea656adee74

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Wed Dec  5 22:59:02 2012 +0100

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)

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-qt/qt4/nativesdk-qt4-tools.inc |    4 ++--
 1 files 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