[oe] [meta-oe][PATCH 2/4] python-pyqt: don't fail when do_configure is executed twice in the same WORKDIR
Martin Jansa
martin.jansa at gmail.com
Fri Oct 5 09:33:37 UTC 2012
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-oe/recipes-devtools/python/python-pyqt_4.9.5.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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() {
--
1.7.12
More information about the Openembedded-devel
mailing list