| Message ID | 20220929104648.324977-1-giulio.benetti@benettiengineering.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] package/qt5: fix build failure due to libressl use | expand |
On Thu, 29 Sep 2022 12:46:48 +0200 Giulio Benetti <giulio.benetti@benettiengineering.com> wrote: > Qt5 only supports openssl, check [0] and [1]. So in qt5base.mk let's check > if BR2_PACKAGE_LIBOPENSSL is enabled instead of BR2_PACKAGE_OPENSSL(that > could be openssl or libressl) and for qt5enginio and qt5webkit let's select > BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL instead of only BR2_PACKAGE_OPENSSL. > This way we make sure that only openssl is selected and not libressl or > other future openssl-like implementations. > > Fixes: > http://autobuild.buildroot.net/results/a956b48b782dbaa055d7146360465e2493a809d9/ > > [0]: https://doc.qt.io/qt-5/ssl.html#enabling-and-disabling-ssl-support > [1]: https://bugreports.qt.io/browse/QTBUG-68374 > > Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> > --- > V1->V2: > * select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL instead of BR2_PACKAGE_LIBOPENSSL > --- > package/qt5/qt5base/qt5base.mk | 4 ++-- > package/qt5/qt5enginio/Config.in | 1 + > package/qt5/qt5webkit/Config.in | 1 + > 3 files changed, 4 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas
>>>>> "Thomas" == Thomas Petazzoni via buildroot <buildroot@buildroot.org> writes: > On Thu, 29 Sep 2022 12:46:48 +0200 > Giulio Benetti <giulio.benetti@benettiengineering.com> wrote: >> Qt5 only supports openssl, check [0] and [1]. So in qt5base.mk let's check >> if BR2_PACKAGE_LIBOPENSSL is enabled instead of BR2_PACKAGE_OPENSSL(that >> could be openssl or libressl) and for qt5enginio and qt5webkit let's select >> BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL instead of only BR2_PACKAGE_OPENSSL. >> This way we make sure that only openssl is selected and not libressl or >> other future openssl-like implementations. >> >> Fixes: >> http://autobuild.buildroot.net/results/a956b48b782dbaa055d7146360465e2493a809d9/ >> >> [0]: https://doc.qt.io/qt-5/ssl.html#enabling-and-disabling-ssl-support >> [1]: https://bugreports.qt.io/browse/QTBUG-68374 >> >> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> >> --- V1-> V2: >> * select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL instead of BR2_PACKAGE_LIBOPENSSL >> --- >> package/qt5/qt5base/qt5base.mk | 4 ++-- >> package/qt5/qt5enginio/Config.in | 1 + >> package/qt5/qt5webkit/Config.in | 1 + >> 3 files changed, 4 insertions(+), 2 deletions(-) > Applied to master, thanks. Committed to 2022.11.x and 2022.02.x, thanks.
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index a81892422c..efa0e16e9a 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -229,8 +229,8 @@ else QT5BASE_CONFIGURE_OPTS += -no-eglfs endif -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl) -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBOPENSSL),-openssl,-no-openssl) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBOPENSSL),openssl) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig) diff --git a/package/qt5/qt5enginio/Config.in b/package/qt5/qt5enginio/Config.in index b738f0db7c..f758548eb5 100644 --- a/package/qt5/qt5enginio/Config.in +++ b/package/qt5/qt5enginio/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_QT5ENGINIO bool "qt5enginio" select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL # Only openssl is supported by qt5 select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_NETWORK help diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 26c3897d1d..e52374550c 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_LEVELDB select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL # Only openssl is supported by qt5 select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS
Qt5 only supports openssl, check [0] and [1]. So in qt5base.mk let's check if BR2_PACKAGE_LIBOPENSSL is enabled instead of BR2_PACKAGE_OPENSSL(that could be openssl or libressl) and for qt5enginio and qt5webkit let's select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL instead of only BR2_PACKAGE_OPENSSL. This way we make sure that only openssl is selected and not libressl or other future openssl-like implementations. Fixes: http://autobuild.buildroot.net/results/a956b48b782dbaa055d7146360465e2493a809d9/ [0]: https://doc.qt.io/qt-5/ssl.html#enabling-and-disabling-ssl-support [1]: https://bugreports.qt.io/browse/QTBUG-68374 Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> --- V1->V2: * select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL instead of BR2_PACKAGE_LIBOPENSSL --- package/qt5/qt5base/qt5base.mk | 4 ++-- package/qt5/qt5enginio/Config.in | 1 + package/qt5/qt5webkit/Config.in | 1 + 3 files changed, 4 insertions(+), 2 deletions(-)