beecrypt: only build C++ support if dependencies are available

Instead of automatically pulling in the (big) icu library if the toolchain
dependencies are available.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard 2014-03-26 16:01:32 +01:00
parent 1015a2e1f5
commit 205839d085
2 changed files with 1 additions and 8 deletions

View File

@ -1,8 +1,6 @@
config BR2_PACKAGE_BEECRYPT
bool "beecrypt"
depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_ICU if BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \
!BR2_arc && !BR2_BINFMT_FLAT
help
Beecrypt is a general-purpose cryptography library.
@ -10,8 +8,3 @@ config BR2_PACKAGE_BEECRYPT
comment "beecrypt needs a toolchain w/ threads"
depends on !BR2_TOOLCHAIN_HAS_THREADS
comment "beecrypt C++ support needs a toolchain w/ wchar"
depends on !BR2_arc
depends on !BR2_BINFMT_FLAT
depends on BR2_INSTALL_LIBSTDCPP && !BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS

View File

@ -22,7 +22,7 @@ BEECRYPT_CONF_OPT = \
--without-python \
--disable-openmp
ifeq ($(BR2_PACKAGE_ICU),y)
ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_USE_WCHAR)$(BR2_PACKAGE_ICU),yyy)
# C++ support needs icu
BEECRYPT_DEPENDENCIES += icu
else