Patchwork [2/2] nativesdk-qt4-tools: fix do_configure to be reentrant

login
register
mail settings
Submitter Martin Jansa
Date Dec. 5, 2012, 9:59 p.m.
Message ID <1354744742-31355-2-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/40521/
State Accepted
Commit 138669057d382a4e5924933614f539431fb2ddf1
Headers show

Comments

Martin Jansa - Dec. 5, 2012, 9:59 p.m.
* 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>
---
 meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

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