From a946657b6e40924a746d1bd86eb023158abd1ab8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 4 Mar 2019 18:28:08 +0100 Subject: package/qt5/qt5base: add BR2_PACKAGE_QT5BASE_OPENSSL Commit c110e48cecde6f543da18388322907b05b25e7d2 disabled openssl support on QT 5.6, this has the side-effect of breaking the build of python-pyqt5 because support of openssl is enabled on python-pyqt5 if BR2_PACKAGE_OPENSSL is selected To fix this issue, add a new BR2_PACKAGE_QT5BASE_OPENSSL option in qt5base and use it in python-pyqt5 Fixes: - http://autobuild.buildroot.org/results/e92991308d47649cecc4084e41ab5711ec96831f Signed-off-by: Fabrice Fontaine [Peter: make _OPENSSL a blind option, add libressl logic for 5.6.x] Signed-off-by: Peter Korsgaard --- package/python-pyqt5/python-pyqt5.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/python-pyqt5/python-pyqt5.mk') diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk index cde026ef63..4955936ae3 100644 --- a/package/python-pyqt5/python-pyqt5.mk +++ b/package/python-pyqt5/python-pyqt5.mk @@ -25,9 +25,9 @@ PYTHON_PYQT5_QTDETAIL_LICENSE = Open Source PYTHON_PYQT5_QTDETAIL_TYPE = shared # Turn off features that aren't available in current qt configuration -PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_OPENSSL),,PyQt_SSL) PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL),,PyQt_OpenGL) PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL_DESKTOP),,PyQt_Desktop_OpenGL) +PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENSSL),,PyQt_SSL) define PYTHON_PYQT5_QTDETAIL echo $(1) >> $(2)/qtdetail.out -- cgit v1.2.3