diff options
| author |   Holger Hans Peter Freyther <zecke@selfish.org> | 2009-08-01 09:25:31 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2009-08-01 13:16:14 +0200 |
| commit | 5a637631891e2a6b4cd18a02107247f636bd4d8a (patch) | |
| tree | 4533e1c9de1339e6905356a130ddbf5d9fc88af6 /recipes/qt4 | |
| parent | 7d34a1965b6a650c06e298331d45165c094f8248 (diff) | |
| download | openembedded-5a637631891e2a6b4cd18a02107247f636bd4d8a.tar.gz | |
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.
Diffstat (limited to 'recipes/qt4')
| -rw-r--r-- | recipes/qt4/qt4.inc | 11 |
1 files changed, 9 insertions, 2 deletions
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 |