mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-12 09:13:59 -09:00
package/qt5: relax openssl constraint to allow compatible implementations
Qt5 can be built with or without openssl support. Following some build failures, commita94d39d693("package/qt5: fix build failure due to libressl use") enforced libopenssl as the only valid implementation for Qt5 openssl support. While this solution is fine to filter between the two openssl variants officially supported by Buildroot, it prevents users bringing their own OpenSSL implementations (through the virtual package mechanism) from building Qt5 with openssl support, even if the custom implementation matches the expected OpenSSL API. Allow compatible external implementations to be provided for Qt5 openssl support. Relax the constraint by partially revertinga94d39d693and checking that the selected openssl implementation isn't libressl. It then becomes up to users to ensure that the implementation they are providing is fully compatible with libopenssl's. Some qt5 sub-packages enforce BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL, they don't need any update as it does not really strictly select libopenssl, it rather prevents libressl, so it still allows custom providers. Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
committed by
Thomas Petazzoni
parent
f48ae88805
commit
2c36fe80fe
@@ -230,8 +230,16 @@ else
|
||||
QT5BASE_CONFIGURE_OPTS += -no-eglfs
|
||||
endif
|
||||
|
||||
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBOPENSSL),-openssl,-no-openssl)
|
||||
QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBOPENSSL),openssl)
|
||||
# Qt5 officially only supports OpenSSL. Users can also provide their own
|
||||
# OpenSSL variant through the virtual package mechanism, but it is then up
|
||||
# to them to ensure that the provided API is exactly compatible with the
|
||||
# libopenssl one
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL):$(BR2_PACKAGE_LIBRESSL),y:)
|
||||
QT5BASE_CONFIGURE_OPTS += -openssl
|
||||
QT5BASE_DEPENDENCIES += openssl
|
||||
else
|
||||
QT5BASE_CONFIGURE_OPTS += -no-openssl
|
||||
endif
|
||||
|
||||
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig)
|
||||
QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig)
|
||||
|
||||
Reference in New Issue
Block a user