Skip to contentSkip to conversation

package/beecrypt: fix C++ support

PATCH New Yann E. MORIN 2 participants 2 messages Aug 15, 2015 – Aug 17, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 package/beecrypt/Config.in   | 6 ++++--
 package/beecrypt/beecrypt.mk | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)
package/beecrypt/Config.in +4 -2
index b9685ef..fc93a77 100644
@@ -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
index cd0b4ac..e66cec1 100644
@@ -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
 
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 package/beecrypt: fix C++ support

Dear Yann E. MORIN,

Quoted 5 lines · Yann E. MORIN

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

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

Quoted 7 lines

Finally, explicitly require C++ support when configuring.

---
 package/beecrypt/Config.in   | 6 ++++--
 package/beecrypt/beecrypt.mk | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com