Merge branch 'next'

Quite some conflicts, so here goes ..

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2016-09-02 16:20:33 +02:00
192 changed files with 1612 additions and 1263 deletions

View File

@@ -3,7 +3,6 @@ config BR2_PACKAGE_LIRC_TOOLS
depends on BR2_USE_MMU # fork()
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_INSTALL_LIBSTDCPP
depends on !BR2_TOOLCHAIN_USES_MUSL # GLOB_BRACE
# dlopen()
depends on !BR2_STATIC_LIBS
help
@@ -19,7 +18,7 @@ config BR2_PACKAGE_LIRC_TOOLS
http://www.lirc.org/
comment "lirc-tools needs a uClibc or glibc toolchain w/ threads, dynamic library, C++"
comment "lirc-tools needs a toolchain w/ threads, dynamic library, C++"
depends on BR2_USE_MMU
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \
|| !BR2_INSTALL_LIBSTDCPP || BR2_TOOLCHAIN_USES_MUSL
|| !BR2_INSTALL_LIBSTDCPP