All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/qt5base: add BR2_PACKAGE_QT5BASE_OPENSSL
@ 2019-03-04 17:28 Fabrice Fontaine
  2019-03-04 19:13 ` Arnout Vandecappelle
  2019-03-04 20:10 ` Peter Korsgaard
  0 siblings, 2 replies; 5+ messages in thread
From: Fabrice Fontaine @ 2019-03-04 17:28 UTC (permalink / raw)
  To: buildroot

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>
---
 package/python-pyqt5/python-pyqt5.mk | 2 +-
 package/qt5/qt5base/Config.in        | 8 ++++++++
 package/qt5/qt5base/qt5base.mk       | 9 ++-------
 3 files changed, 11 insertions(+), 8 deletions(-)

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..709fec8d3b 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -286,6 +286,14 @@ 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 "OpenSSL support"
+	# No OpenSSL 1.1.x support in Qt 5.6.x
+	depends on !BR2_PACKAGE_QT5_VERSION_5_6
+	select BR2_PACKAGE_OPENSSL
+	help
+	  This option enables OpenSSL support.
+
 config BR2_PACKAGE_QT5BASE_TSLIB
 	bool "Enable Tslib support"
 	select BR2_PACKAGE_TSLIB
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index a5ce583327..20f8a21d91 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -188,13 +188,8 @@ 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_OPENSSL),-openssl,-no-openssl)
+QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_OPENSSL),openssl)
 
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig)
 QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig)
-- 
2.14.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] package/qt5base: add BR2_PACKAGE_QT5BASE_OPENSSL
  2019-03-04 17:28 [Buildroot] [PATCH 1/1] package/qt5base: add BR2_PACKAGE_QT5BASE_OPENSSL Fabrice Fontaine
@ 2019-03-04 19:13 ` Arnout Vandecappelle
  2019-03-04 20:10 ` Peter Korsgaard
  1 sibling, 0 replies; 5+ messages in thread
From: Arnout Vandecappelle @ 2019-03-04 19:13 UTC (permalink / raw)
  To: buildroot



On 04/03/2019 18:28, Fabrice Fontaine wrote:
> 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

 I like it!

> 
> Fixes:
>  - http://autobuild.buildroot.org/results/e92991308d47649cecc4084e41ab5711ec96831f
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/python-pyqt5/python-pyqt5.mk | 2 +-
>  package/qt5/qt5base/Config.in        | 8 ++++++++
>  package/qt5/qt5base/qt5base.mk       | 9 ++-------
>  3 files changed, 11 insertions(+), 8 deletions(-)
> 
> 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..709fec8d3b 100644
> --- a/package/qt5/qt5base/Config.in
> +++ b/package/qt5/qt5base/Config.in
> @@ -286,6 +286,14 @@ 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 "OpenSSL support"

 Since this was implicitly enabled before, you should add

	default y

here.

> +	# No OpenSSL 1.1.x support in Qt 5.6.x
> +	depends on !BR2_PACKAGE_QT5_VERSION_5_6

 James added a follow-up patch that re-enabled it for libressl. That one would
have to be rewritten as well, obviously. It will be difficult, though, since you
get circular dependencies... So, if that can't be solved, I'm not sure we should
accept this patch either (although I really like the approach).

 Regards,
 Arnout

> +	select BR2_PACKAGE_OPENSSL
> +	help
> +	  This option enables OpenSSL support.
> +
>  config BR2_PACKAGE_QT5BASE_TSLIB
>  	bool "Enable Tslib support"
>  	select BR2_PACKAGE_TSLIB
> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
> index a5ce583327..20f8a21d91 100644
> --- a/package/qt5/qt5base/qt5base.mk
> +++ b/package/qt5/qt5base/qt5base.mk
> @@ -188,13 +188,8 @@ 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_OPENSSL),-openssl,-no-openssl)
> +QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_OPENSSL),openssl)
>  
>  QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig)
>  QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig)
> 

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] package/qt5base: add BR2_PACKAGE_QT5BASE_OPENSSL
  2019-03-04 17:28 [Buildroot] [PATCH 1/1] package/qt5base: add BR2_PACKAGE_QT5BASE_OPENSSL Fabrice Fontaine
  2019-03-04 19:13 ` Arnout Vandecappelle
@ 2019-03-04 20:10 ` Peter Korsgaard
  2019-03-06 19:34   ` Fabrice Fontaine
  1 sibling, 1 reply; 5+ messages in thread
From: Peter Korsgaard @ 2019-03-04 20:10 UTC (permalink / raw)
  To: buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > 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>
 > ---
 >  package/python-pyqt5/python-pyqt5.mk | 2 +-
 >  package/qt5/qt5base/Config.in        | 8 ++++++++
 >  package/qt5/qt5base/qt5base.mk       | 9 ++-------
 >  3 files changed, 11 insertions(+), 8 deletions(-)

 > 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..709fec8d3b 100644
 > --- a/package/qt5/qt5base/Config.in
 > +++ b/package/qt5/qt5base/Config.in
 > @@ -286,6 +286,14 @@ 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 "OpenSSL support"
 > +	# No OpenSSL 1.1.x support in Qt 5.6.x
 > +	depends on !BR2_PACKAGE_QT5_VERSION_5_6
 > +	select BR2_PACKAGE_OPENSSL
 > +	help
 > +	  This option enables OpenSSL support.
 > +

I kept this as a blind option to not change behaviour and added the
logic for the recently added libressl support for 5.6.x and committed,
thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] package/qt5base: add BR2_PACKAGE_QT5BASE_OPENSSL
  2019-03-04 20:10 ` Peter Korsgaard
@ 2019-03-06 19:34   ` Fabrice Fontaine
  2019-03-07  9:31     ` Peter Korsgaard
  0 siblings, 1 reply; 5+ messages in thread
From: Fabrice Fontaine @ 2019-03-06 19:34 UTC (permalink / raw)
  To: buildroot

Dear Peter,
Le lun. 4 mars 2019 ? 21:10, Peter Korsgaard <peter@korsgaard.com> a ?crit :
>
> >>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
>
>  > 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>
>  > ---
>  >  package/python-pyqt5/python-pyqt5.mk | 2 +-
>  >  package/qt5/qt5base/Config.in        | 8 ++++++++
>  >  package/qt5/qt5base/qt5base.mk       | 9 ++-------
>  >  3 files changed, 11 insertions(+), 8 deletions(-)
>
>  > 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..709fec8d3b 100644
>  > --- a/package/qt5/qt5base/Config.in
>  > +++ b/package/qt5/qt5base/Config.in
>  > @@ -286,6 +286,14 @@ 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 "OpenSSL support"
>  > +    # No OpenSSL 1.1.x support in Qt 5.6.x
>  > +    depends on !BR2_PACKAGE_QT5_VERSION_5_6
>  > +    select BR2_PACKAGE_OPENSSL
>  > +    help
>  > +      This option enables OpenSSL support.
>  > +
>
> I kept this as a blind option to not change behaviour and added the
> logic for the recently added libressl support for 5.6.x and committed,
> thanks.
Thanks for taking care of this however qt5enginio also fails to build
without SSL on QT5.6:
http://autobuild.buildroot.org/results/579dfa53451ad78563faaad514f47d80851c3234

We can't add a dependency or a select on the blind
BR2_PACKAGE_QT5BASE_OPENSSL option so what should we do?
>
> --
> Bye, Peter Korsgaard
Best Regards,

Fabrice

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] package/qt5base: add BR2_PACKAGE_QT5BASE_OPENSSL
  2019-03-06 19:34   ` Fabrice Fontaine
@ 2019-03-07  9:31     ` Peter Korsgaard
  0 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2019-03-07  9:31 UTC (permalink / raw)
  To: buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

Hi,

 > Dear Peter,
 >> I kept this as a blind option to not change behaviour and added the
 >> logic for the recently added libressl support for 5.6.x and committed,
 >> thanks.
 > Thanks for taking care of this however qt5enginio also fails to build
 > without SSL on QT5.6:
 > http://autobuild.buildroot.org/results/579dfa53451ad78563faaad514f47d80851c3234

 > We can't add a dependency or a select on the blind
 > BR2_PACKAGE_QT5BASE_OPENSSL option so what should we do?

I guess we should just change the select BR2_PACKAGE_OPENSSL part to:

select BR2_PACKAGE_LIBRESSL if BR2_PACKAGE_QT5_VERSION_5_6
select BR2_PACKAGE_OPENSSL if BR2_PACKAGE_QT5_VERSION_LATEST

(and the corresponding change in the .mk)

-- 
Bye, Peter Korsgaard

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

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-04 17:28 [Buildroot] [PATCH 1/1] package/qt5base: add BR2_PACKAGE_QT5BASE_OPENSSL Fabrice Fontaine
2019-03-04 19:13 ` Arnout Vandecappelle
2019-03-04 20:10 ` Peter Korsgaard
2019-03-06 19:34   ` Fabrice Fontaine
2019-03-07  9:31     ` Peter Korsgaard

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.