From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sat, 1 Aug 2009 07:25:31 +0000 (+0200)
Subject: qt4: Do not recreate the link if it exists otherwise do_install will fail
X-Git-Tag: Release-2010-05/1~2833
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a637631891e2a6b4cd18a02107247f636bd4d8a;p=openembedded.git

qt4: Do not recreate the link if it exists otherwise do_install will fail

When running configure more than once the do_install stage
will fail due excessive symlinks... Stop doing that.
---

diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index b4f53c14b7..79240eda12 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -122,8 +122,15 @@ FILES_${QT_BASE_NAME}-mkspecs              = "${datadir}/${QT_DIR_NAME}/mkspecs/
 do_configure() {
     unset QMAKESPEC
     unset QTDIR
-    ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
-    ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++
+
+    if [! -e bin/qmake]; then
+        ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
+    fi
+
+    if [! -e mkspecs/${TARGET_OS}-oe-g++]; then
+        ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++
+    fi
+
     cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf mkspecs/common/
 
     echo "[Paths]"                                 > $QT_CONF_PATH