Skip to contentSkip to conversation

package/qt5base: add BR2_PACKAGE_QT5BASE_OPENSSL

PATCH New Fabrice Fontaine 3 participants 5 messages Mar 4, 2019 – Mar 7, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/qt5base: add BR2_PACKAGE_QT5BASE_OPENSSL

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

---
 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(-)
package/python-pyqt5/python-pyqt5.mk +1 -1
index cde026ef63..4955936ae3 100644
@@ -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
package/qt5/qt5base/Config.in +8 -0
index 1340ea48f0..709fec8d3b 100644
@@ -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
package/qt5/qt5base/qt5base.mk +2 -7
index a5ce583327..20f8a21d91 100644
@@ -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)
Signature · 1 line
2.14.1
#1 lore raw

PATCH 1/1 package/qt5base: add BR2_PACKAGE_QT5BASE_OPENSSL

Quoted 7 lines · Fabrice Fontaine

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!

Quoted 31 lines

Fixes:
- http://autobuild.buildroot.org/results/e92991308d47649cecc4084e41ab5711ec96831f

---
 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(-)
package/python-pyqt5/python-pyqt5.mk +1 -1
index cde026ef63..4955936ae3 100644
@@ -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
package/qt5/qt5base/Config.in +0 -0
index 1340ea48f0..709fec8d3b 100644

package/qt5/qt5base/Config.in comment "icu support needs a toolchain w/ gcc >= 4.8, host gcc >= 4.8" · line 290

Quoted 5 lines
package/qt5/qt5base/Config.in +2 -0
@@ -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.

package/qt5/qt5base/Config.in comment "icu support needs a toolchain w/ gcc >= 4.8, host gcc >= 4.8" · line 292

Quoted 2 lines
package/qt5/qt5base/Config.in +2 -0
+	# 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

Quoted 28 lines
package/qt5/qt5base/Config.in +4 -0
+	select BR2_PACKAGE_OPENSSL
+	help
+	  This option enables OpenSSL support.
+
 config BR2_PACKAGE_QT5BASE_TSLIB
 	bool "Enable Tslib support"
 	select BR2_PACKAGE_TSLIB
package/qt5/qt5base/qt5base.mk +2 -7
index a5ce583327..20f8a21d91 100644
@@ -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 lore raw

PATCH 1/1 package/qt5base: add BR2_PACKAGE_QT5BASE_OPENSSL

In reply to Fabrice Fontaine
Quoted 41 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> 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

---
 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(-)
package/python-pyqt5/python-pyqt5.mk +1 -1
index cde026ef63..4955936ae3 100644
@@ -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
package/qt5/qt5base/Config.in +0 -0
index 1340ea48f0..709fec8d3b 100644
@@ -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 || \

package/qt5/qt5base/Config.in comment "icu support needs a toolchain w/ gcc >= 4.8, host gcc >= 4.8" · line 296

Quoted 10 lines
package/qt5/qt5base/Config.in +8 -0
 		!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.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/1 package/qt5base: add BR2_PACKAGE_QT5BASE_OPENSSL

Dear Peter,
Le lun. 4 mars 2019 ? 21:10, Peter Korsgaard <[email protected]> a ?crit :

Quoted 44 lines
Quoted 43 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

"Fabrice" == Fabrice Fontaine <[email protected]> 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

---
 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(-)
package/python-pyqt5/python-pyqt5.mk +1 -1
index cde026ef63..4955936ae3 100644
@@ -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
package/qt5/qt5base/Config.in +0 -0
index 1340ea48f0..709fec8d3b 100644
@@ -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
Quoted 12 lines

package/qt5/qt5base/Config.in comment "icu support needs a toolchain w/ gcc >= 4.8, host gcc >= 4.8" · line 296

Quoted 8 lines
package/qt5/qt5base/Config.in +8 -0
+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?

Quoted 3 lines

--
Bye, Peter Korsgaard

Best Regards,

Fabrice

#4 lore raw

PATCH 1/1 package/qt5base: add BR2_PACKAGE_QT5BASE_OPENSSL

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

Hi,

Quoted 10 lines

Dear Peter,

Quoted 3 lines

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)

Signature · 1 line
Bye, Peter Korsgaard