All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [git commit] package/qt5/qt5base: add BR2_PACKAGE_QT5BASE_OPENSSL
@ 2019-03-04 20:13 Peter Korsgaard
  2019-03-05 19:31 ` Arnout Vandecappelle
  0 siblings, 1 reply; 4+ messages in thread
From: Peter Korsgaard @ 2019-03-04 20:13 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=a946657b6e40924a746d1bd86eb023158abd1ab8
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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 <fontaine.fabrice@gmail.com>
[Peter: make _OPENSSL a blind option, add libressl logic for 5.6.x]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-pyqt5/python-pyqt5.mk | 2 +-
 package/qt5/qt5base/Config.in        | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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
diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index 1340ea48f0..696e689758 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -286,6 +286,12 @@ comment "icu support needs a toolchain w/ gcc >= 4.8, host gcc >= 4.8"
 	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
 		!BR2_HOST_GCC_AT_LEAST_4_8
 
+config BR2_PACKAGE_QT5BASE_OPENSSL
+	bool
+	# No OpenSSL 1.1.x support in Qt 5.6.x
+	default y if BR2_PACKAGE_QT5_VERSION_5_6 && BR2_PACKAGE_LIBRESSL
+	default y if BR2_PACKAGE_QT5_VERSION_LATEST && BR2_PACKAGE_OPENSSL
+
 config BR2_PACKAGE_QT5BASE_TSLIB
 	bool "Enable Tslib support"
 	select BR2_PACKAGE_TSLIB

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [Buildroot] [git commit] package/qt5/qt5base: add BR2_PACKAGE_QT5BASE_OPENSSL
  2019-03-04 20:13 [Buildroot] [git commit] package/qt5/qt5base: add BR2_PACKAGE_QT5BASE_OPENSSL Peter Korsgaard
@ 2019-03-05 19:31 ` Arnout Vandecappelle
  2019-03-07 21:02   ` Peter Korsgaard
  0 siblings, 1 reply; 4+ messages in thread
From: Arnout Vandecappelle @ 2019-03-05 19:31 UTC (permalink / raw)
  To: buildroot



On 04/03/2019 21:13, Peter Korsgaard wrote:
> commit: https://git.buildroot.net/buildroot/commit/?id=a946657b6e40924a746d1bd86eb023158abd1ab8
> branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
> 
> 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 <fontaine.fabrice@gmail.com>
> [Peter: make _OPENSSL a blind option, add libressl logic for 5.6.x]
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ---
>  package/python-pyqt5/python-pyqt5.mk | 2 +-
>  package/qt5/qt5base/Config.in        | 6 ++++++
>  2 files changed, 7 insertions(+), 1 deletion(-)
> 
> 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
> diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
> index 1340ea48f0..696e689758 100644
> --- a/package/qt5/qt5base/Config.in
> +++ b/package/qt5/qt5base/Config.in
> @@ -286,6 +286,12 @@ comment "icu support needs a toolchain w/ gcc >= 4.8, host gcc >= 4.8"
>  	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
>  		!BR2_HOST_GCC_AT_LEAST_4_8
>  
> +config BR2_PACKAGE_QT5BASE_OPENSSL
> +	bool
> +	# No OpenSSL 1.1.x support in Qt 5.6.x
> +	default y if BR2_PACKAGE_QT5_VERSION_5_6 && BR2_PACKAGE_LIBRESSL
> +	default y if BR2_PACKAGE_QT5_VERSION_LATEST && BR2_PACKAGE_OPENSSL

 Now it's not enabled for libressl... The && OPENSSL should be removed I think.

 Regards,
 Arnout

> +
>  config BR2_PACKAGE_QT5BASE_TSLIB
>  	bool "Enable Tslib support"
>  	select BR2_PACKAGE_TSLIB
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [Buildroot] [git commit] package/qt5/qt5base: add BR2_PACKAGE_QT5BASE_OPENSSL
  2019-03-05 19:31 ` Arnout Vandecappelle
@ 2019-03-07 21:02   ` Peter Korsgaard
  2019-03-07 21:37     ` Arnout Vandecappelle
  0 siblings, 1 reply; 4+ messages in thread
From: Peter Korsgaard @ 2019-03-07 21:02 UTC (permalink / raw)
  To: buildroot

>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:

Hi,

 >> +config BR2_PACKAGE_QT5BASE_OPENSSL
 >> +	bool
 >> +	# No OpenSSL 1.1.x support in Qt 5.6.x
 >> +	default y if BR2_PACKAGE_QT5_VERSION_5_6 && BR2_PACKAGE_LIBRESSL
 >> +	default y if BR2_PACKAGE_QT5_VERSION_LATEST && BR2_PACKAGE_OPENSSL

 >  Now it's not enabled for libressl... The && OPENSSL should be removed I think.

Sorry, I don't follow? If we are using 5.6, then _OPENSSL should be true
if libressl is enabled, and for latest if openssl is enabled.

Is that not what this code does?

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [Buildroot] [git commit] package/qt5/qt5base: add BR2_PACKAGE_QT5BASE_OPENSSL
  2019-03-07 21:02   ` Peter Korsgaard
@ 2019-03-07 21:37     ` Arnout Vandecappelle
  0 siblings, 0 replies; 4+ messages in thread
From: Arnout Vandecappelle @ 2019-03-07 21:37 UTC (permalink / raw)
  To: buildroot



On 07/03/2019 22:02, Peter Korsgaard wrote:
>>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:
> 
> Hi,
> 
>  >> +config BR2_PACKAGE_QT5BASE_OPENSSL
>  >> +	bool
>  >> +	# No OpenSSL 1.1.x support in Qt 5.6.x
>  >> +	default y if BR2_PACKAGE_QT5_VERSION_5_6 && BR2_PACKAGE_LIBRESSL
>  >> +	default y if BR2_PACKAGE_QT5_VERSION_LATEST && BR2_PACKAGE_OPENSSL
> 
>  >  Now it's not enabled for libressl... The && OPENSSL should be removed I think.
> 
> Sorry, I don't follow? If we are using 5.6, then _OPENSSL should be true
> if libressl is enabled, and for latest if openssl is enabled.
> 
> Is that not what this code does?

 Oops, sorry, I had misread _OPENSSL as _LIBOPENSSL.

 Regards,
 Arnout

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-03-07 21:37 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-04 20:13 [Buildroot] [git commit] package/qt5/qt5base: add BR2_PACKAGE_QT5BASE_OPENSSL Peter Korsgaard
2019-03-05 19:31 ` Arnout Vandecappelle
2019-03-07 21:02   ` Peter Korsgaard
2019-03-07 21:37     ` Arnout Vandecappelle

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.