diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-08-01 11:51:02 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-08-07 12:21:23 +0200 |
| commit | 878a0c84727a3f709400a93289bef7025432a946 (patch) | |
| tree | d005d8384da1480ce5dc6a8c9f339e01fadaf846 /meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff | |
| parent | 910feab3e7cae1a74562c930be032566824968eb (diff) | |
| download | meta-openembedded-878a0c84727a3f709400a93289bef7025432a946.tar.gz | |
python-pyqt: import from oe-classic
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff')
| -rw-r--r-- | meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff b/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff new file mode 100644 index 0000000000..e7a68829ad --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff | |||
| @@ -0,0 +1,15 @@ | |||
| 1 | Description: Fix QtHelp FTBFS with ld --no-add-needed. | ||
| 2 | Author: Felix Geyer <debfx-pkg@fobos.de> | ||
| 3 | |||
| 4 | --- python-qt4-4.8.1.orig/configure.py | ||
| 5 | +++ python-qt4-4.8.1/configure.py | ||
| 6 | @@ -364,7 +364,8 @@ class ConfigurePyQt4: | ||
| 7 | pyqt_modules.append("QtCore") | ||
| 8 | |||
| 9 | check_module("QtGui", "qwidget.h", "new QWidget()") | ||
| 10 | - check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")") | ||
| 11 | + check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")", | ||
| 12 | + extra_libs=["QtCore"]) | ||
| 13 | check_module("QtMultimedia", "QAudioDeviceInfo", | ||
| 14 | "new QAudioDeviceInfo()") | ||
| 15 | check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()") | ||