* [Buildroot] [PATCH 2/2] package/qt5/qt5base: exclude OpenSSL functionality for Qt 5.6.x
2019-03-01 2:17 [Buildroot] [PATCH 1/2] package/qt5/qt5base: add custom configure options last James Grant
@ 2019-03-01 2:17 ` James Grant
2019-03-01 9:14 ` Peter Korsgaard
2019-03-01 7:28 ` [Buildroot] [PATCH 1/2] package/qt5/qt5base: add custom configure options last Thomas Petazzoni
2019-03-01 9:13 ` Peter Korsgaard
2 siblings, 1 reply; 6+ messages in thread
From: James Grant @ 2019-03-01 2:17 UTC (permalink / raw)
To: buildroot
No patch back-porting OpenSSL 1.1.x support to Qt 5.6.x is available.
https://development.qt-project.narkive.com/RW4wxYXY/openssl-1-1-x-support-on-qt-5-6-5-9
Signed-off-by: James Grant <james.grant@jci.com>
---
package/qt5/qt5base/qt5base.mk | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 8c0f5f0c9f..a5ce583327 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -52,8 +52,6 @@ else
# option '-no-avx512' (available for latest only)
endif
-QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS))
-
ifeq ($(BR2_PACKAGE_LIBDRM),y)
QT5BASE_CONFIGURE_OPTS += -kms
QT5BASE_DEPENDENCIES += libdrm
@@ -190,8 +188,13 @@ 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_FONTCONFIG),-fontconfig,-no-fontconfig)
QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig)
--
2.21.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] package/qt5/qt5base: add custom configure options last
2019-03-01 2:17 [Buildroot] [PATCH 1/2] package/qt5/qt5base: add custom configure options last James Grant
2019-03-01 2:17 ` [Buildroot] [PATCH 2/2] package/qt5/qt5base: exclude OpenSSL functionality for Qt 5.6.x James Grant
@ 2019-03-01 7:28 ` Thomas Petazzoni
2019-03-01 7:36 ` James Grant
2019-03-01 9:13 ` Peter Korsgaard
2 siblings, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2019-03-01 7:28 UTC (permalink / raw)
To: buildroot
Hello James,
On Fri, 1 Mar 2019 15:17:11 +1300
James Grant <james.grant@jci.com> wrote:
> This allows all options set by Buildroot to be overridden.
>
> Signed-off-by: James Grant <james.grant@jci.com>
> ---
> package/qt5/qt5base/qt5base.mk | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
> index 11c6684812..8c0f5f0c9f 100644
> --- a/package/qt5/qt5base/qt5base.mk
> +++ b/package/qt5/qt5base/qt5base.mk
> @@ -296,6 +296,9 @@ define QT5BASE_CONFIGURE_HOSTCC
> $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf
> endef
>
> +# Must be last so can override all options set by Buildroot
> +QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS))
Shouldn't this line also be removed from where it originally was ?
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] package/qt5/qt5base: add custom configure options last
2019-03-01 7:28 ` [Buildroot] [PATCH 1/2] package/qt5/qt5base: add custom configure options last Thomas Petazzoni
@ 2019-03-01 7:36 ` James Grant
0 siblings, 0 replies; 6+ messages in thread
From: James Grant @ 2019-03-01 7:36 UTC (permalink / raw)
To: buildroot
On 1/03/2019 20:28, Thomas Petazzoni wrote:
> Hello James,
>
> On Fri, 1 Mar 2019 15:17:11 +1300
> James Grant <james.grant@jci.com> wrote:
>
>> This allows all options set by Buildroot to be overridden.
>>
>> Signed-off-by: James Grant <james.grant@jci.com>
>> ---
>> package/qt5/qt5base/qt5base.mk | 3 +++
>> 1 file changed, 3 insertions(+)
>>
>> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
>> index 11c6684812..8c0f5f0c9f 100644
>> --- a/package/qt5/qt5base/qt5base.mk
>> +++ b/package/qt5/qt5base/qt5base.mk
>> @@ -296,6 +296,9 @@ define QT5BASE_CONFIGURE_HOSTCC
>> $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf
>> endef
>>
>> +# Must be last so can override all options set by Buildroot
>> +QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS))
> Shouldn't this line also be removed from where it originally was ?
Yes - sorry, I didn't split the two patches I sent for qt5base properly.
Do people want/need them resent?
Regards,
James Grant.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] package/qt5/qt5base: add custom configure options last
2019-03-01 2:17 [Buildroot] [PATCH 1/2] package/qt5/qt5base: add custom configure options last James Grant
2019-03-01 2:17 ` [Buildroot] [PATCH 2/2] package/qt5/qt5base: exclude OpenSSL functionality for Qt 5.6.x James Grant
2019-03-01 7:28 ` [Buildroot] [PATCH 1/2] package/qt5/qt5base: add custom configure options last Thomas Petazzoni
@ 2019-03-01 9:13 ` Peter Korsgaard
2 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2019-03-01 9:13 UTC (permalink / raw)
To: buildroot
>>>>> "James" == James Grant <james.grant@jci.com> writes:
> This allows all options set by Buildroot to be overridden.
> Signed-off-by: James Grant <james.grant@jci.com>
> ---
> package/qt5/qt5base/qt5base.mk | 3 +++
> 1 file changed, 3 insertions(+)
> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
> index 11c6684812..8c0f5f0c9f 100644
> --- a/package/qt5/qt5base/qt5base.mk
> +++ b/package/qt5/qt5base/qt5base.mk
> @@ -296,6 +296,9 @@ define QT5BASE_CONFIGURE_HOSTCC
> $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf
> endef
> +# Must be last so can override all options set by Buildroot
> +QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS))
> +
Committed after removing the original line as pointed out by Thomas, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread