Patchwork [meta-oe,2/4] python-pyqt: don't fail when do_configure is executed twice in the same WORKDIR

login
register
mail settings
Submitter Martin Jansa
Date Oct. 5, 2012, 9:33 a.m.
Message ID <7d138796d21a96574a436506d48c0181f61fadc6.1349429575.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/37803/
State Accepted
Commit 1ee0ffac8c917ff0505adf6b91249b7689398434
Headers show

Comments

Martin Jansa - Oct. 5, 2012, 9:33 a.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-devtools/python/python-pyqt_4.9.5.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

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() {