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: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/beecrypt/Config.in b/package/beecrypt/Config.in
index b9685ef3b062b9a5339feb3cedcc9d471cc493ff..fc93a7760560c9d1f7086aa17272fbdf202e8c66 100644 (file)
--- a/package/beecrypt/Config.in
+++ b/package/beecrypt/Config.in
@@ -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

diff --git a/package/beecrypt/beecrypt.mk b/package/beecrypt/beecrypt.mk
index cd0b4ac96bcab95489b9acd0e5cfdd2417ec5583..e66cec10d68df3c31e9fd3e83fa4a28babd05565 100644 (file)
--- a/package/beecrypt/beecrypt.mk
+++ b/package/beecrypt/beecrypt.mk
@@ -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