[Buildroot] [git commit] package/beecrypt: fix C++ support
From: Thomas Petazzoni <hidden>
Date: 2015-08-17 20:45:25
Subsystem:
the rest · Maintainer:
Linus Torvalds
commit: http://git.buildroot.net/buildroot/commit/?id=a1c16fb29926d2cc9b65229befc1a08ac11b14e8 branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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" <redacted> Signed-off-by: Thomas Petazzoni <redacted> --- package/beecrypt/Config.in | 6 ++++-- package/beecrypt/beecrypt.mk | 1 + 2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/package/beecrypt/Config.in b/package/beecrypt/Config.in
index b9685ef..fc93a77 100644
--- 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 cd0b4ac..e66cec1 100644
--- 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