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

@@ -5,7 +5,6 @@ menuconfig BR2_PACKAGE_MPD
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
depends on BR2_USE_MMU # libglib2
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_6
depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_ATOMIC
select BR2_PACKAGE_BOOST
select BR2_PACKAGE_LIBGLIB2
@@ -312,7 +311,6 @@ endif
comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 4.6"
depends on BR2_USE_MMU
depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_ATOMIC
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_6