From: James Grant Date: Fri, 1 Mar 2019 02:17:12 +0000 (+1300) Subject: package/qt5/qt5base: exclude OpenSSL functionality for Qt 5.6.x X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c110e48cecde6f543da18388322907b05b25e7d2;p=buildroot.git package/qt5/qt5base: exclude OpenSSL functionality for Qt 5.6.x No patch back-porting OpenSSL 1.1.x support to Qt 5.6.x is available. https://development.qt-project.narkive.com/RW4wxYXY/openssl-1-1-x-support-on-qt-5-6-5-9 Signed-off-by: James Grant Signed-off-by: Peter Korsgaard --- diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index e71878a487..a5ce583327 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -188,8 +188,13 @@ else QT5BASE_CONFIGURE_OPTS += -no-eglfs endif +ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) +# No OpenSSL 1.1.x support in Qt 5.6.x +QT5BASE_CONFIGURE_OPTS += -no-openssl +else QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl) +endif QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig)