aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorPhilip Balister <philip@balister.org>2015-10-29 16:43:14 -0400
committerMartin Jansa <Martin.Jansa@gmail.com>2015-11-06 17:49:40 +0100
commit51abcdcbdced22cceadba65f5a45f1eb84dd8055 (patch)
tree60f80ed9082e42e8d6f1cb81c7f2cdb578aa66b7 /meta-oe
parentc617059bccb297743ad0ae6cdb676c9cb8694498 (diff)
downloadmeta-openembedded-contrib-51abcdcbdced22cceadba65f5a45f1eb84dd8055.tar.gz
meta-openembedded-contrib-51abcdcbdced22cceadba65f5a45f1eb84dd8055.tar.bz2
meta-openembedded-contrib-51abcdcbdced22cceadba65f5a45f1eb84dd8055.zip
python-pyqt: Fix build for aarch64.
Qt for aarch64 disable QtWebKit due to a build failure. We need to disable QtWebKit here also until the problem is resolved in the Qt recipe. Signed-off-by: Philip Balister <philip@balister.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-devtools/python/python-pyqt_4.11.3.bb5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta-oe/recipes-devtools/python/python-pyqt_4.11.3.bb b/meta-oe/recipes-devtools/python/python-pyqt_4.11.3.bb
index 160a5d502e..cfddee8698 100644
--- a/meta-oe/recipes-devtools/python/python-pyqt_4.11.3.bb
+++ b/meta-oe/recipes-devtools/python/python-pyqt_4.11.3.bb
@@ -30,6 +30,9 @@ DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager"
DISABLED_FEATURES_append_arm = " PyQt_qreal_double"
+PYQT_MODULES = "QtCore QtGui QtDeclarative QtNetwork QtSvg QtWebKit"
+PYQT_MODULES_aarch64 = "QtCore QtGui QtDeclarative QtNetwork QtSvg"
+
do_configure() {
echo "py_platform = linux" > pyqt.cfg
echo "py_inc_dir = %(sysroot)/$includedir/python%(py_major).%(py_minor)" >> pyqt.cfg
@@ -42,7 +45,7 @@ do_configure() {
echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg
echo "qt_shared = True" >> pyqt.cfg
echo "[Qt 4.8]" >> pyqt.cfg
- echo "pyqt_modules = QtCore QtGui QtDeclarative QtNetwork QtSvg QtWebKit" >> pyqt.cfg
+ echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg
echo yes | python configure-ng.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/qmake2 --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST}
}
do_install() {