Skip to contentSkip to conversation

package/qt5/Config.in: fix typo

PATCH New Bartosz Bilas 3 participants 4 messages Apr 20, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/qt5/Config.in: fix typo

There is no BR2_TOOLCHAIN_GCC_AT_LEAST_5_0 option
but BR2_TOOLCHAIN_GCC_AT_LEAST_5.

---
 package/qt5/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/qt5/Config.in +2 -2
index cd9c93735d..c716919476 100644
@@ -16,14 +16,14 @@ comment "Qt5 needs a toolchain w/ gcc >= 5.0, wchar, NPTL, C++, dynamic library"
 	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_0
+		!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_TOOLCHAIN_GCC_AT_LEAST_5_0 # C++11, GCC_BUG_57694
+	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
 	depends on !BR2_arc
Signature · 1 line
2.26.1
#1 lore raw

PATCH 1/1 package/qt5/Config.in: fix typo

Bartosz, All,

On 2020-04-20 17:10 +0200, Bartosz Bilas spake thusly:

Quoted 4 lines

There is no BR2_TOOLCHAIN_GCC_AT_LEAST_5_0 option
but BR2_TOOLCHAIN_GCC_AT_LEAST_5.

I also fixed pinentry and wireshark, which had the incorrect version introduced with the same commit as qt5. Adapted the commit log and pushed to master, thanks.

Regards,
Yann E. MORIN.

Quoted 32 lines
---
 package/qt5/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/qt5/Config.in +2 -2
index cd9c93735d..c716919476 100644
@@ -16,14 +16,14 @@ comment "Qt5 needs a toolchain w/ gcc >= 5.0, wchar, NPTL, C++, dynamic library"
 	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_0
+		!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_TOOLCHAIN_GCC_AT_LEAST_5_0 # C++11, GCC_BUG_57694
+	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
 	depends on !BR2_arc
Signature · 6 lines
2.26.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 package/qt5/Config.in: fix typo

Hi Yann,

Quoted 10 lines · Yann E. MORIN

Bartosz, All,

On 2020-04-20 17:10 +0200, Bartosz Bilas spake thusly:

Quoted 4 lines

There is no BR2_TOOLCHAIN_GCC_AT_LEAST_5_0 option
but BR2_TOOLCHAIN_GCC_AT_LEAST_5.

I also fixed pinentry and wireshark, which had the incorrect version introduced with the same commit as qt5. Adapted the commit log and pushed to master, thanks.

maybe a good idea would be to introduce some verify-tests for those non-existing options (if it's possible ofc.) because as we see someone can make the same mistake again.

Quoted 32 lines

Regards,
Yann E. MORIN.

Quoted 28 lines
---
  package/qt5/Config.in | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
package/qt5/Config.in +2 -2
index cd9c93735d..c716919476 100644
@@ -16,14 +16,14 @@ comment "Qt5 needs a toolchain w/ gcc >= 5.0, wchar, NPTL, C++, dynamic library"
  	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_0
+		!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_TOOLCHAIN_GCC_AT_LEAST_5_0 # C++11, GCC_BUG_57694
+	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
  	depends on !BR2_arc
Signature · 1 line
2.26.1
Quoted 4 lines
Quoted 4 lines

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Best
Bartek

#3 lore raw

PATCH 1/1 package/qt5/Config.in: fix typo

In reply to Yann E. MORIN

Hello Yann, Bartosz,

Quoted 5 lines · Yann E. MORIN

Bartosz, All,

On 2020-04-20 17:10 +0200, Bartosz Bilas spake thusly:

Quoted 2 lines

There is no BR2_TOOLCHAIN_GCC_AT_LEAST_5_0 option
but BR2_TOOLCHAIN_GCC_AT_LEAST_5.

Argh....only checked for the disabling case and did not check the positive one....

Quoted 6 lines
Quoted 2 lines

I also fixed pinentry and wireshark, which had the incorrect version introduced with the same commit as qt5. Adapted the commit log and pushed to master, thanks.

Thanks to both of you for fixing my mistake...

Regards,
Peter

Quoted 37 lines

Regards,
Yann E. MORIN.

Quoted 32 lines
---
 package/qt5/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/qt5/Config.in +2 -3
index cd9c93735d..c716919476 100644
@@ -16,14 +16,14 @@ comment "Qt5 needs a toolchain w/ gcc >= 5.0, wchar, NPTL, C++, dynamic library"
 	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_0
+		!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_TOOLCHAIN_GCC_AT_LEAST_5_0 # C++11, GCC_BUG_57694
+	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
 	depends on !BR2_arc
--

2.26.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot