Commit 3fb263f7 authored by Arnout Vandecappelle's avatar Arnout Vandecappelle Committed by Peter Korsgaard
Browse files

beecrypt: make a config option for C++ support 



beecrypt used to pull in icu automatically when C++ support was enabled,
but since icu is pretty large and slow, that automatic dependency was
removed.  However, it is not obvious to the user that he should enable
icu in order to get C++ support in beecrypt. Therefore, make the C++
support a user visible config option and mention icu in the help text.

It would also be possible to automatically enable C++ support if icu
happens to be selected for another reason, but that doesn't really seem
to offer an advantage.

Signed-off-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 0ac91f8f

package/beecrypt/Config.in

+21 −2
Original line number Diff line number Diff line 
comment "beecrypt needs a toolchain w/ threads"

	depends on !BR2_TOOLCHAIN_HAS_THREADS



config BR2_PACKAGE_BEECRYPT

	bool "beecrypt"

	depends on BR2_TOOLCHAIN_HAS_THREADS
@@ -6,5 +9,21 @@ config BR2_PACKAGE_BEECRYPT 


	  http://beecrypt.sf.net



comment "beecrypt needs a toolchain w/ threads"

	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
if BR2_PACKAGE_BEECRYPT



config BR2_PACKAGE_BEECRYPT_CPP

	bool "C++ support"

	depends on BR2_INSTALL_LIBSTDCPP

	depends on BR2_USE_WCHAR # icu

	depends on !BR2_arc # icu

	depends on !BR2_BINFMT_FLAT # icu

	select BR2_PACKAGE_ICU

	help

	  Enable C++ support. This pulls in the (large) icu package.



comment "C++ support needs a toolchain w/ wchar"

	depends on !BR2_arc

	depends on !BR2_BINFMT_FLAT

	depends on BR2_INSTALL_LIBSTDCPP && !BR2_USE_WCHAR



endif # BR2_PACKAGE_BEECRYPT

package/beecrypt/beecrypt.mk

+1 −2
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ BEECRYPT_CONF_OPT = \ 
		--without-python \

		--disable-openmp



ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_USE_WCHAR)$(BR2_PACKAGE_ICU),yyy)

# C++ support needs icu

ifeq ($(BR2_PACKAGE_BEECRYPT_CPP),y)

BEECRYPT_DEPENDENCIES += icu

else

BEECRYPT_CONF_OPT += --without-cplusplus