Skip to contentSkip to conversation

package/qt5: needs host gcc >= 5.0 for full C++11

PATCH New Yann E. MORIN 2 participants 2 messages Aug 23, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/qt5: needs host gcc >= 5.0 for full C++11

Building qmake requires full C++11, which boils down to gcc >= 5.0, which is what upstream advertises as a requirement anyway:

    https://doc.qt.io/qt-5.15/supported-platforms.html

    Distribution   | Architecture     | Compiler
    Generic Linux  | x86 and x86_64   | GCC (5 or later), ICC 18.x

Fixes:

    http://autobuild.buildroot.org/results/c3e/c3ee971a72f268e72b69a647e8fd00a8cee7dc91/
    http://autobuild.buildroot.org/results/89c/89c9a88b4e1195e952528574263201d4fbc27570/
    [...]
Cc Peter Seiderer <[email protected]>
Cc Julien Corjon <[email protected]>
---
 package/pinentry/Config.in  | 1 +
 package/qt5/Config.in       | 5 +++--
 package/wireshark/Config.in | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)
package/pinentry/Config.in +1 -0
index 40e5b3eedd..d3afd63216 100644
@@ -61,6 +61,7 @@ config BR2_PACKAGE_PINENTRY_QT5
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	depends on BR2_HOST_GCC_AT_LEAST_5
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5
 	depends on !BR2_arc
 	depends on !BR2_STATIC_LIBS
package/qt5/Config.in +3 -2
index 5c544ecec4..e897c7cbcb 100644
@@ -11,18 +11,19 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE
 	# ARM needs BLX, so v5t+
 	depends on !BR2_ARM_CPU_ARMV4
 
-comment "Qt5 needs a toolchain w/ gcc >= 5.0, wchar, NPTL, C++, dynamic library"
+comment "Qt5 needs host g++ >= 5.0, and a toolchain w/ gcc >= 5.0, wchar, NPTL, C++, dynamic library"
 	depends on !BR2_ARM_CPU_ARMV4
 	depends on !BR2_arc
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_5
+		!BR2_HOST_GCC_AT_LEAST_5 || !BR2_TOOLCHAIN_GCC_AT_LEAST_5
 
 menuconfig BR2_PACKAGE_QT5
 	bool "Qt5"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	depends on BR2_HOST_GCC_AT_LEAST_5 # Full C++11
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11, GCC_BUG_57694
 	depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+
 	# no built-in double-conversion support
package/wireshark/Config.in +1 -0
index e3a9b01991..c40135c9c0 100644
@@ -20,6 +20,7 @@ config BR2_PACKAGE_WIRESHARK_GUI
 	bool "Qt5 GUI"
 	default y
 	depends on BR2_INSTALL_LIBSTDCPP # qt5
+	depends on BR2_HOST_GCC_AT_LEAST_5 # qt5
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # qt5
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # qt5
 	depends on !BR2_arc # qt5
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/qt5: needs host gcc >= 5.0 for full C++11

Quoted 8 lines · On Sun, 23 Aug 2020 19:33:52 +0200 "Yann E. MORIN" <[email protected]>…

Building qmake requires full C++11, which boils down to gcc >= 5.0, which is what upstream advertises as a requirement anyway:

    https://doc.qt.io/qt-5.15/supported-platforms.html

    Distribution   | Architecture     | Compiler
    Generic Linux  | x86 and x86_64   | GCC (5 or later), ICC 18.x
Quoted 8 lines

Fixes:

    http://autobuild.buildroot.org/results/c3e/c3ee971a72f268e72b69a647e8fd00a8cee7dc91/
    http://autobuild.buildroot.org/results/89c/89c9a88b4e1195e952528574263201d4fbc27570/
    [...]
Cc Peter Seiderer <[email protected]>
Cc Julien Corjon <[email protected]>

Thanks for doing this. You had forgotten to update the Config.in comments in pinentry and wireshark, so I did that when applying to master.

Long term, I don't think those pinentry and wireshark options should select the Qt5 package, it should probably "depends on" it. I believe if you want the wireshark Qt GUI, it's pretty obvious that you need Qt.

Thanks!

Thomas

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