mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-12-05 03:13:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

packags: fix typo in gcc version dependency

Browse Source 
Commit 24c66484e1 (package/qt5: bump minimum gcc requirement to 5.0)
increased the dependency on the gcc version, but used the incorrect
BR2_TOOLCHAIN_GCC_AT_LEAST_5_0, instead of BR2_TOOLCHAIN_GCC_AT_LEAST_5.

Signed-off-by: Bartosz Bilas <b.bilas@grinn-global.com>
[yann.morin.1998@free.fr:
  - also fix pinentry and wireshark
  - expand commit log
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Bartosz Bilas 2020-04-20 17:10:24 +02:00 committed by Yann E. MORIN
parent adc2376bbb
commit bb4b143a09
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/pinentry/Config.in
View File

@ -61,7 +61,7 @@ config BR2_PACKAGE_PINENTRY_QT5
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR depends on BR2_USE_WCHAR
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5_0 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5
depends on !BR2_arc depends on !BR2_arc
depends on !BR2_STATIC_LIBS depends on !BR2_STATIC_LIBS
select BR2_PACKAGE_QT5 select BR2_PACKAGE_QT5
@ -73,7 +73,7 @@ config BR2_PACKAGE_PINENTRY_QT5
comment "pinentry-qt5 needs a toolchain w/ wchar, NPTL, gcc >= 5.0, 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_arc
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_5_0 || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \
BR2_STATIC_LIBS BR2_STATIC_LIBS
endif endif

4
package/qt5/Config.in
View File

@ -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_arc
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ !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 menuconfig BR2_PACKAGE_QT5
bool "Qt5" bool "Qt5"
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR depends on BR2_USE_WCHAR
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL 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+ depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+
# no built-in double-conversion support # no built-in double-conversion support
depends on !BR2_arc depends on !BR2_arc

4
package/wireshark/Config.in
View File

@ -21,7 +21,7 @@ config BR2_PACKAGE_WIRESHARK_GUI
default y default y
depends on BR2_INSTALL_LIBSTDCPP # qt5 depends on BR2_INSTALL_LIBSTDCPP # qt5
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # qt5 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # qt5
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5_0 # qt5 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # qt5
depends on !BR2_arc # qt5 depends on !BR2_arc # qt5
depends on BR2_PACKAGE_HAS_UDEV # qt5 input depends on BR2_PACKAGE_HAS_UDEV # qt5 input
select BR2_PACKAGE_QT5 select BR2_PACKAGE_QT5
@ -39,7 +39,7 @@ config BR2_PACKAGE_WIRESHARK_GUI
comment "Qt5 GUI needs a udev /dev management and a toolchain w/ C++, NPTL, gcc >= 5.0" comment "Qt5 GUI needs a udev /dev management and a toolchain w/ C++, NPTL, gcc >= 5.0"
depends on !BR2_arc depends on !BR2_arc
depends on !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP || \ depends on !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_5_0 !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_5
endif # BR2_PACKAGE_WIRESHARK endif # BR2_PACKAGE_WIRESHARK