diff options
| -rw-r--r-- | package/python-pyqt/Config.in | 10 | ||||
| -rw-r--r-- | package/python-pyqt/python-pyqt.mk | 8 |
2 files changed, 17 insertions, 1 deletions
diff --git a/package/python-pyqt/Config.in b/package/python-pyqt/Config.in index d4544fa226..a50cb74a43 100644 --- a/package/python-pyqt/Config.in +++ b/package/python-pyqt/Config.in @@ -13,3 +13,13 @@ config BR2_PACKAGE_PYTHON_PYQT PyQt4 for Qt Embedded 4 bindings. http://www.riverbankcomputing.com/software/pyqt/ + +if BR2_PACKAGE_PYTHON_PYQT + +config BR2_PACKAGE_PYTHON_PYQT_ARCH_USES_QREAL_FLOAT + bool + default y if BR2_arm || BR2_armeb + default y if BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb + default y if (BR2_mipsel || BR2_mips) && BR2_PACKAGE_QT_EMBEDDED + +endif diff --git a/package/python-pyqt/python-pyqt.mk b/package/python-pyqt/python-pyqt.mk index 2363f7d062..2445567700 100644 --- a/package/python-pyqt/python-pyqt.mk +++ b/package/python-pyqt/python-pyqt.mk @@ -33,13 +33,19 @@ endif # Turn off features that aren't available in QWS and current qt # configuration. PYTHON_PYQT_QTDETAIL_DISABLE_FEATURES = \ - PyQt_Accessibility PyQt_SessionManager PyQt_qreal_double \ + PyQt_Accessibility PyQt_SessionManager \ PyQt_Shortcut PyQt_RawFont ifeq ($(BR2_PACKAGE_QT_OPENSSL),) PYTHON_PYQT_QTDETAIL_DISABLE_FEATURES += PyQt_OpenSSL endif +# PyQt_qreal_double must be disabled on a number of architectures that +# use float for qreal. +ifeq ($(BR2_PACKAGE_PYTHON_PYQT_ARCH_USES_QREAL_FLOAT),y) +PYTHON_PYQT_QTDETAIL_DISABLE_FEATURES += PyQt_qreal_double +endif + define PYTHON_PYQT_QTDETAIL echo $(1) >> $(2)/qtdetail.out endef |
