Commit a1c16fb2 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Thomas Petazzoni
Browse files

package/beecrypt: fix C++ support 



C++ support unconditionally needs shared libraries; it uses
dlopen/dlsym.

Also, fix the conditions under which the comment is shown.

Finally, explicitly require C++ support when configuring.

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 4c71130b

package/beecrypt/Config.in

+4 −2
Original line number Diff line number Diff line
@@ -17,13 +17,15 @@ config BR2_PACKAGE_BEECRYPT_CPP 
	depends on BR2_USE_WCHAR # icu

	depends on !BR2_BINFMT_FLAT # icu

	depends on BR2_ARCH_HAS_ATOMICS # icu

	depends on !BR2_STATIC_LIBS

	select BR2_PACKAGE_ICU

	help

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



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

comment "C++ support needs a toolchain w/ C++, wchar, dynamic libraries"

	depends on !BR2_BINFMT_FLAT

	depends on BR2_ARCH_HAS_ATOMICS

	depends on BR2_INSTALL_LIBSTDCPP && !BR2_USE_WCHAR

	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \

		|| BR2_STATIC_LIBS



endif # BR2_PACKAGE_BEECRYPT

package/beecrypt/beecrypt.mk

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ BEECRYPT_CONF_OPTS = \ 


ifeq ($(BR2_PACKAGE_BEECRYPT_CPP),y)

BEECRYPT_DEPENDENCIES += icu

BEECRYPT_CONF_OPTS += --with-cplusplus

else

BEECRYPT_CONF_OPTS += --without-cplusplus