From: Martin Jansa <martin.jansa@gmail.com>
Date: Wed, 5 Dec 2012 21:59:02 +0000 (+0100)
Subject: nativesdk-qt4-tools: fix do_configure to be reentrant
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~39225
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f891901bcf7be95cebca1a7296e7ea656adee74;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
index 85c7eabbc37..5ed0e90553d 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