Skip to contentSkip to conversation

package/qt5/qt5base: add custom configure options last

PATCH New James Grant 4 participants 6 messages Mar 1, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/qt5/qt5base: add custom configure options last

This allows all options set by Buildroot to be overridden.

---
 package/qt5/qt5base/qt5base.mk | 3 +++
 1 file changed, 3 insertions(+)
package/qt5/qt5base/qt5base.mk +3 -0
index 11c6684812..8c0f5f0c9f 100644
@@ -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))
+
 define QT5BASE_CONFIGURE_CMDS
 	mkdir -p $(@D)/mkspecs/devices/linux-buildroot-g++/
 	sed 's/@EGLFS_DEVICE@/$(QT5BASE_EGLFS_DEVICE)/g' \
Signature · 1 line
2.21.0
#1 lore raw

PATCH 2/2 package/qt5/qt5base: exclude OpenSSL functionality for Qt 5.6.x

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

---
 package/qt5/qt5base/qt5base.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
package/qt5/qt5base/qt5base.mk +5 -2
index 8c0f5f0c9f..a5ce583327 100644
@@ -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)
Signature · 1 line
2.21.0
#2 lore raw

PATCH 2/2 package/qt5/qt5base: exclude OpenSSL functionality for Qt 5.6.x

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"James" == James Grant <[email protected]> writes:

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

Committed, thanks.

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

PATCH 1/2 package/qt5/qt5base: add custom configure options last

In reply to James Grant

Hello James,

Quoted 12 lines · On Fri, 1 Mar 2019 15:17:11 +1300 James Grant <[email protected]> wrote:

This allows all options set by Buildroot to be overridden.

---
 package/qt5/qt5base/qt5base.mk | 3 +++
 1 file changed, 3 insertions(+)
package/qt5/qt5base/qt5base.mk +0 -0
index 11c6684812..8c0f5f0c9f 100644

package/qt5/qt5base/qt5base.mk define QT5BASE_CONFIGURE_HOSTCC · line 300

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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH 1/2 package/qt5/qt5base: add custom configure options last

Quoted 20 lines · Thomas Petazzoni

Hello James,

Quoted 15 lines · On Fri, 1 Mar 2019 15:17:11 +1300 James Grant <[email protected]> wrote:

This allows all options set by Buildroot to be overridden.

---
  package/qt5/qt5base/qt5base.mk | 3 +++
  1 file changed, 3 insertions(+)
package/qt5/qt5base/qt5base.mk +0 -0
index 11c6684812..8c0f5f0c9f 100644
@@ -296,6 +296,9 @@ define QT5BASE_CONFIGURE_HOSTCC
  	$(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf
  endef
 
Quoted 3 lines

package/qt5/qt5base/qt5base.mk define QT5BASE_CONFIGURE_HOSTCC · line 300

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

#5 lore raw

PATCH 1/2 package/qt5/qt5base: add custom configure options last

In reply to James Grant
Quoted 13 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"James" == James Grant <[email protected]> writes:

This allows all options set by Buildroot to be overridden.

---
 package/qt5/qt5base/qt5base.mk | 3 +++
 1 file changed, 3 insertions(+)
package/qt5/qt5base/qt5base.mk +0 -0
index 11c6684812..8c0f5f0c9f 100644

package/qt5/qt5base/qt5base.mk define QT5BASE_CONFIGURE_HOSTCC · line 301

Quoted 6 lines
package/qt5/qt5base/qt5base.mk +3 -0
@@ -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.

Signature · 1 line
Bye, Peter Korsgaard