diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2016-09-02 16:20:33 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-09-02 16:20:33 +0200 |
| commit | 7353967690b425fd6519756979f3ef839b1a9cd1 (patch) | |
| tree | a910fd6b794556251fe607295c631aed98534235 /package/lirc-tools | |
| parent | cff53ce35b8dab3bbdd9aa4471d1ecb3238c9fab (diff) | |
| parent | 1bd02bc230e1b3b22ca3eb23fb3dcb91b878283a (diff) | |
| download | buildroot-7353967690b425fd6519756979f3ef839b1a9cd1.tar.gz buildroot-7353967690b425fd6519756979f3ef839b1a9cd1.zip | |
Merge branch 'next'
Quite some conflicts, so here goes ..
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/lirc-tools')
| -rw-r--r-- | package/lirc-tools/Config.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/package/lirc-tools/Config.in b/package/lirc-tools/Config.in index 60476b7935..6eaf828817 100644 --- a/package/lirc-tools/Config.in +++ b/package/lirc-tools/Config.in @@ -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 |
