Skip to contentSkip to conversation

package/qt5: bump minimum gcc requirement to 5.0

PATCH New Peter Seiderer 3 participants 12 messages Apr 18, 2020 – May 6, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/6 package/qt5: bump minimum gcc requirement to 5.0

As a side effect of avoiding gcc bug 57694 ([1]) through commit 'GCC: revoke constexpr before 5.0' ([2]) for qtbase the minimum gcc requirement was lifted to 5.0 ([3], [4]), so bump the buildroot determined one too.

Adjust the two packages (pinentry, wireshark) which are brave enough to do a 'select BR2_PACKAGE_QT5' accordingly.

Fixes:
http://autobuild.buildroot.net/results/74f5249d1ee14c1269685af53a65055da7dc2ee6

../../include/QtCore/../../src/corelib/thread/qbasicatomic.h:61:4: error: #error "Qt requires C++11 support"
# error "Qt requires C++11 support"

[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57694
[2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=c61cedcc5475a77fb94ed12788f61039835f8079
[3] https://codereview.qt-project.org/c/qt/qtbase/+/285582
[4] https://bugreports.qt.io/browse/QTBUG-81761

---
 package/pinentry/Config.in  | 6 +++---
 package/qt5/Config.in       | 6 +++---
 package/wireshark/Config.in | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)
package/pinentry/Config.in +3 -3
index ef70908502..23f532e2e6 100644
@@ -61,7 +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_TOOLCHAIN_GCC_AT_LEAST_4_8
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5_0
 	depends on !BR2_arc
 	depends on !BR2_STATIC_LIBS
 	select BR2_PACKAGE_QT5
@@ -70,10 +70,10 @@ config BR2_PACKAGE_PINENTRY_QT5
 	help
 	  The pinentry-qt5 tool
 
-comment "pinentry-qt5 needs a toolchain w/ wchar, NPTL, gcc >= 4.8, C++, dynamic library"
+comment "pinentry-qt5 needs a toolchain w/ wchar, NPTL, gcc >= 5.0, C++, dynamic library"
 	depends on !BR2_arc
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
-		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
+		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_5_0 || \
 		BR2_STATIC_LIBS
 
 endif
package/qt5/Config.in +3 -3
index 77dce16038..cd9c93735d 100644
@@ -11,19 +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 >= 4.8, wchar, NPTL, C++, dynamic library"
+comment "Qt5 needs 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_4_8
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_5_0
 
 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_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5_0 # C++11, GCC_BUG_57694
 	depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+
 	# no built-in double-conversion support
 	depends on !BR2_arc
package/wireshark/Config.in +3 -3
index e52edb9f69..f55cfeb497 100644
@@ -21,7 +21,7 @@ config BR2_PACKAGE_WIRESHARK_GUI
 	default y
 	depends on BR2_INSTALL_LIBSTDCPP # qt5
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # qt5
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5_0 # qt5
 	depends on !BR2_arc # qt5
 	depends on BR2_PACKAGE_HAS_UDEV # qt5 input
 	select BR2_PACKAGE_QT5
@@ -36,10 +36,10 @@ config BR2_PACKAGE_WIRESHARK_GUI
 	help
 	  Enable Qt5 GUI
 
-comment "Qt5 GUI needs a udev /dev management and a toolchain w/ C++, NPTL, gcc >= 4.8"
+comment "Qt5 GUI needs a udev /dev management and a toolchain w/ C++, NPTL, gcc >= 5.0"
 	depends on !BR2_arc
 	depends on !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP || \
-		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_5_0
 
 endif # BR2_PACKAGE_WIRESHARK
 
Signature · 1 line
2.26.0
#1 lore raw

PATCH 2/6 package/qt5base: drop all legacy gcc requierements below 5.0

As qt5 requires as minimum gcc 5.0 drop all legacy requierements below.

---
 package/qt5/qt5base/Config.in | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
package/qt5/qt5base/Config.in +1 -8
index 60a611e292..358a54bc1d 100644
@@ -233,9 +233,7 @@ config BR2_PACKAGE_QT5BASE_FONTCONFIG
 
 config BR2_PACKAGE_QT5BASE_HARFBUZZ
 	bool "harfbuzz support"
-	select BR2_PACKAGE_HARFBUZZ if \
-		BR2_TOOLCHAIN_HAS_SYNC_4 && \
-		BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+	select BR2_PACKAGE_HARFBUZZ if BR2_TOOLCHAIN_HAS_SYNC_4
 	help
 	  This option enables HarfBuzz support (either system harfbuzz
 	  if the toolchain supports __sync for 4 bytes, or the qt
@@ -273,16 +271,11 @@ config BR2_PACKAGE_QT5BASE_DBUS
 config BR2_PACKAGE_QT5BASE_ICU
 	bool "Enable ICU support"
 	depends on !BR2_BINFMT_FLAT # icu
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu
 	select BR2_PACKAGE_ICU
 	help
 	  This option enables ICU support in Qt5. This is for example
 	  needed for Qt5Webkit.
 
-comment "icu support needs a toolchain w/ gcc >= 4.8"
-	depends on !BR2_BINFMT_FLAT
-	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
-
 config BR2_PACKAGE_QT5BASE_TSLIB
 	bool "Enable Tslib support"
 	select BR2_PACKAGE_TSLIB
Signature · 1 line
2.26.0
#2 lore raw

PATCH 2/6 package/qt5base: drop all legacy gcc requierements below 5.0

Quoted 6 lines · On Sun, 19 Apr 2020 00:59:02 +0200 Peter Seiderer <[email protected]> wrote:

As qt5 requires as minimum gcc 5.0 drop all legacy requierements below.

---
 package/qt5/qt5base/Config.in | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

I have not applied this one, and neither the remaining patches in the series. Indeed, we normally want to propagate "depends on" to all reverse dependencies, even if in practice it is already not possible to select a given option due to it being hidden by a "depends on" at a higher level.

We believe that always duplicating improves consistency and helps avoiding mistakes. I agree that we are not 100% consistent on this throughout the tree, but the direction we want to go to is to replicate these "depends no", not get rid of them.

I agree that this is a very 'opinionated' decision and I am myself a bit split between the two possibilities we have. But the overall consensus seems to be that we should have that duplication.

So, I've marked PATCH 2/6 to 6/6 as Rejected.

Thanks!

Thomas

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

PATCH 2/6 package/qt5base: drop all legacy gcc requierements below 5.0

Hello Thomas,

Quoted 21 lines · Thomas Petazzoni
Quoted 6 lines · On Sun, 19 Apr 2020 00:59:02 +0200 Peter Seiderer <[email protected]> wrote:

As qt5 requires as minimum gcc 5.0 drop all legacy requierements below.

---
 package/qt5/qt5base/Config.in | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

I have not applied this one, and neither the remaining patches in the series. Indeed, we normally want to propagate "depends on" to all reverse dependencies, even if in practice it is already not possible to select a given option due to it being hidden by a "depends on" at a higher level.

We believe that always duplicating improves consistency and helps avoiding mistakes. I agree that we are not 100% consistent on this throughout the tree, but the direction we want to go to is to replicate these "depends no", not get rid of them.

Quoted 5 lines

I agree that this is a very 'opinionated' decision and I am myself a bit split between the two possibilities we have. But the overall consensus seems to be that we should have that duplication.

So, I've marked PATCH 2/6 to 6/6 as Rejected.

Fine with me ;-), and thanks for the detailed explanation...

Regards,
Peter

Quoted 4 lines

Thanks!

Thomas

#4 lore raw

PATCH 3/6 package/qt5tools: drop all legacy gcc requierements below 5.0

In reply to Peter Seiderer

As qt5 requires as minimum gcc 5.0 drop all legacy requierements below.

---
 package/qt5/qt5tools/Config.in | 1 -
 1 file changed, 1 deletion(-)
package/qt5/qt5tools/Config.in +0 -1
index 60106c1ee3..f01b51d2e8 100644
@@ -23,7 +23,6 @@ config BR2_PACKAGE_QT5TOOLS_QDOC_TOOL
 	# currently supported in Buildroot, unless the target is
 	# already supported by llvm.
 	depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS # llvm, clang
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # llvm, clang
 	depends on BR2_TOOLCHAIN_HAS_THREADS # llvm, clang
 	depends on BR2_INSTALL_LIBSTDCPP # llvm, clang
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # llvm, clang
Signature · 1 line
2.26.0
#5 lore raw

PATCH 4/6 package/qt5webengine: drop all legacy gcc requierements below 5.0

In reply to Peter Seiderer

As qt5 requires as minimum gcc 5.0 drop all legacy requierements below.

---
 package/qt5/qt5webengine/Config.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
package/qt5/qt5webengine/Config.in +1 -3
index a05205c7ad..56b6da8b0e 100644
@@ -10,10 +10,9 @@ config BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
 	depends on !BR2_BINFMT_FLAT # qt5base-icu
 	depends on BR2_USE_MMU # libglib2, qt5base-dbus
 
-comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 4.8, threads, wchar"
+comment "qt5webengine needs udev /dev management and a glibc toolchain w/ threads, wchar"
 	depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
 	depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_USES_GLIBC || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
 		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
 
 comment "qt5webengine needs an OpenGL and EGL-capable backend"
@@ -24,7 +23,6 @@ config BR2_PACKAGE_QT5WEBENGINE
 	bool "qt5webengine"
 	depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5base-icu
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs
Signature · 1 line
2.26.0
#6 lore raw

PATCH 5/6 package/qt5webkit: drop all legacy gcc requierements below 5.0

In reply to Peter Seiderer

As qt5 requires as minimum gcc 5.0 drop all legacy requierements below.

---
 package/qt5/qt5webkit/Config.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
package/qt5/qt5webkit/Config.in +2 -3
index e071dff208..5adcddfb5d 100644
@@ -3,7 +3,6 @@ config BR2_PACKAGE_QT5WEBKIT
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
 	depends on BR2_INSTALL_LIBSTDCPP # leveldb
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu
 	depends on BR2_TOOLCHAIN_HAS_THREADS # leveldb
 	depends on !BR2_BINFMT_FLAT # icu
 	# assumes a FPU is available on MIPS
@@ -31,8 +30,8 @@ config BR2_PACKAGE_QT5WEBKIT
 
 	  http://doc.qt.io/archives/qt-5.5/qtwebkit-index.html
 
-comment "qt5webkit needs a toolchain w/ dynamic library, gcc >= 4.8"
-	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+comment "qt5webkit needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
 	depends on !BR2_BINFMT_FLAT
 	depends on !BR2_MIPS_SOFT_FLOAT
Signature · 1 line
2.26.0
#7 lore raw

PATCH 6/6 package/qt-webkit-kiosk: drop all legacy gcc requierements below 5.0

In reply to Peter Seiderer

As qt5 requires as minimum gcc 5.0 drop all legacy requierements below.

---
 package/qt-webkit-kiosk/Config.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
package/qt-webkit-kiosk/Config.in +2 -3
index 46688a227b..b620154ed1 100644
@@ -3,7 +3,6 @@ config BR2_PACKAGE_QT_WEBKIT_KIOSK
 	depends on BR2_PACKAGE_QT5
 	depends on !BR2_STATIC_LIBS # qt5webkit
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5webkit
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5webkit -> icu
 	depends on !BR2_BINFMT_FLAT # qt5webkit -> icu
 	depends on !BR2_MIPS_SOFT_FLOAT # qt5webkit
 	select BR2_PACKAGE_OPENSSL
@@ -25,8 +24,8 @@ config BR2_PACKAGE_QT_WEBKIT_KIOSK_SOUNDS
 
 endif
 
-comment "qt-webkit-kiosk needs a toolchain w/ dynamic library, gcc >= 4.8"
-	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+comment "qt-webkit-kiosk needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
 	depends on !BR2_BINFMT_FLAT
 	depends on !BR2_MIPS_SOFT_FLOAT
Signature · 1 line
2.26.0
#8 lore raw

PATCH 1/6 package/qt5: bump minimum gcc requirement to 5.0

In reply to Peter Seiderer
Quoted 7 lines · On Sun, 19 Apr 2020 00:59:01 +0200 Peter Seiderer <[email protected]> wrote:

As a side effect of avoiding gcc bug 57694 ([1]) through commit 'GCC: revoke constexpr before 5.0' ([2]) for qtbase the minimum gcc requirement was lifted to 5.0 ([3], [4]), so bump the buildroot determined one too.

Adjust the two packages (pinentry, wireshark) which are brave enough to do a 'select BR2_PACKAGE_QT5' accordingly.

Huhu, "brave enough" :-)

Quoted 11 lines

Fixes:
http://autobuild.buildroot.net/results/74f5249d1ee14c1269685af53a65055da7dc2ee6

../../include/QtCore/../../src/corelib/thread/qbasicatomic.h:61:4: error: #error "Qt requires C++11 support"
# error "Qt requires C++11 support"

[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57694
[2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=c61cedcc5475a77fb94ed12788f61039835f8079
[3] https://codereview.qt-project.org/c/qt/qtbase/+/285582
[4] https://bugreports.qt.io/browse/QTBUG-81761

Quoted 6 lines
---
 package/pinentry/Config.in  | 6 +++---
 package/qt5/Config.in       | 6 +++---
 package/wireshark/Config.in | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

Applied to master, thanks.

Thomas

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

PATCH 1/6 package/qt5: bump minimum gcc requirement to 5.0

In reply to Peter Seiderer
Quoted 16 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

As a side effect of avoiding gcc bug 57694 ([1]) through commit 'GCC: revoke constexpr before 5.0' ([2]) for qtbase the minimum gcc requirement was lifted to 5.0 ([3], [4]), so bump the buildroot determined one too.

Adjust the two packages (pinentry, wireshark) which are brave enough to do a 'select BR2_PACKAGE_QT5' accordingly.

Fixes:
http://autobuild.buildroot.net/results/74f5249d1ee14c1269685af53a65055da7dc2ee6

../../include/QtCore/../../src/corelib/thread/qbasicatomic.h:61:4: error: #error "Qt requires C++11 support"
# error "Qt requires C++11 support"

Quoted 6 lines

[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57694
[2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=c61cedcc5475a77fb94ed12788f61039835f8079
[3] https://codereview.qt-project.org/c/qt/qtbase/+/285582
[4] https://bugreports.qt.io/browse/QTBUG-81761

Does this also apply to the qt5 version we have in 2020.02.x (E.G. 5.12.8)?

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

PATCH 1/6 package/qt5: bump minimum gcc requirement to 5.0

Hello Peter,

Quoted 21 lines · Peter Korsgaard
Quoted 20 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

As a side effect of avoiding gcc bug 57694 ([1]) through commit 'GCC: revoke constexpr before 5.0' ([2]) for qtbase the minimum gcc requirement was lifted to 5.0 ([3], [4]), so bump the buildroot determined one too.

Adjust the two packages (pinentry, wireshark) which are brave enough to do a 'select BR2_PACKAGE_QT5' accordingly.

Fixes:
http://autobuild.buildroot.net/results/74f5249d1ee14c1269685af53a65055da7dc2ee6

../../include/QtCore/../../src/corelib/thread/qbasicatomic.h:61:4: error: #error "Qt requires C++11 support"
# error "Qt requires C++11 support"

[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57694
[2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=c61cedcc5475a77fb94ed12788f61039835f8079
[3] https://codereview.qt-project.org/c/qt/qtbase/+/285582
[4] https://bugreports.qt.io/browse/QTBUG-81761

Quoted 5 lines
Quoted 1 line

Does this also apply to the qt5 version we have in 2020.02.x (E.G. 5.12.8)?

Qt-5.12.8 should not be affected as commit [2] is not part of this release...

Regards,
Peter

#11 lore raw

PATCH 1/6 package/qt5: bump minimum gcc requirement to 5.0

Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

Hello Peter,

Quoted 4 lines · Peter Korsgaard

Does this also apply to the qt5 version we have in 2020.02.x (E.G. 5.12.8)?

Qt-5.12.8 should not be affected as commit [2] is not part of this release...

Ok, thanks for the confirmation!

Signature · 1 line
Bye, Peter Korsgaard