Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2016-06-01 17:55:16 +02:00
314 changed files with 3530 additions and 5099 deletions

View File

@@ -15,7 +15,6 @@ config BR2_PACKAGE_PULSEVIEW
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
# libsigrok
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
help
@@ -27,6 +26,5 @@ config BR2_PACKAGE_PULSEVIEW
comment "pulseview needs a toolchain w/ wchar, threads, C++, gcc >= 4.8"
depends on BR2_USE_MMU
depends on BR2_PACKAGE_QT5
depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \
|| !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP