diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2012-10-04 18:49:42 +0200 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-10-05 12:17:40 +0200 |
| commit | 1ee0ffac8c917ff0505adf6b91249b7689398434 (patch) | |
| tree | 4aaef9c4d839f631e57b11d59bbf01bf8898c647 /meta-oe/recipes-devtools | |
| parent | 58cb1dfe3efbcdfc2969daf4010784d06b9c543a (diff) | |
| download | meta-openembedded-1ee0ffac8c917ff0505adf6b91249b7689398434.tar.gz | |
python-pyqt: don't fail when do_configure is executed twice in the same WORKDIR
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools')
| -rw-r--r-- | meta-oe/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 9feab4df8c..5eef4c9903 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() { |