mirror of
https://github.com/godotengine/buildroot.git
synced 2026-01-08 02:09:48 +03:00
Merge branch 'next'
Quite some conflicts, so here goes .. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained 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
|
||||
|
||||
Reference in New Issue
Block a user