[oe-commits] Martin Jansa : python-pyqt: don' t fail when do_configure is executed twice in the same WORKDIR

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 1ee0ffac8c917ff0505adf6b91249b7689398434
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=1ee0ffac8c917ff0505adf6b91249b7689398434

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Oct  4 18:49:42 2012 +0200

python-pyqt: don't fail when do_configure is executed twice in the same WORKDIR

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../recipes-devtools/python/python-pyqt_4.9.5.bb   |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta-oe/recipes-devtools/python/python-pyqt_4.9.5.bb b/meta-oe/recipes-devtools/python/python-pyqt_4.9.5.bb
index 9feab4d..5eef4c9 100644
--- a/meta-oe/recipes-devtools/python/python-pyqt_4.9.5.bb
+++ b/meta-oe/recipes-devtools/python/python-pyqt_4.9.5.bb
@@ -83,7 +83,7 @@ do_configure_prepend() {
     echo "LIBS+=-L../qpy/QtCore/ -lqpycore" >>QtCore/QtCore.pro
     echo "LIBS+=-L../qpy/QtDeclarative/ -lqpydeclarative" >>QtDeclarative/QtDeclarative.pro
     # hack for broken generated code (duplicated sipCpp declaration).
-    patch -p1 < ${WORKDIR}/pyqt-generated.patch
+    patch -p1 < ${WORKDIR}/pyqt-generated.patch || echo "pyqt-generated.patch failed to apply, probably reexecuting do_configure, ignoring that"
 }
 
 do_install() {