NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/beecrypt: fix C++ support

Browse Source 
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>
This commit is contained in:
Yann E. MORIN 2015-08-15 14:46:42 +02:00 committed by Thomas Petazzoni
parent 4c71130b61
commit a1c16fb299
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/beecrypt/Config.in
View File

@ -17,13 +17,15 @@ config BR2_PACKAGE_BEECRYPT_CPP
depends on BR2_USE_WCHAR # icu depends on BR2_USE_WCHAR # icu
depends on !BR2_BINFMT_FLAT # icu depends on !BR2_BINFMT_FLAT # icu
depends on BR2_ARCH_HAS_ATOMICS # icu depends on BR2_ARCH_HAS_ATOMICS # icu
depends on !BR2_STATIC_LIBS
select BR2_PACKAGE_ICU select BR2_PACKAGE_ICU
help help
Enable C++ support. This pulls in the (large) icu package. 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_BINFMT_FLAT
depends on BR2_ARCH_HAS_ATOMICS 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 endif # BR2_PACKAGE_BEECRYPT

1
package/beecrypt/beecrypt.mk
View File

@ -19,6 +19,7 @@ BEECRYPT_CONF_OPTS = \
ifeq ($(BR2_PACKAGE_BEECRYPT_CPP),y) ifeq ($(BR2_PACKAGE_BEECRYPT_CPP),y)
BEECRYPT_DEPENDENCIES += icu BEECRYPT_DEPENDENCIES += icu
BEECRYPT_CONF_OPTS += --with-cplusplus
else else
BEECRYPT_CONF_OPTS += --without-cplusplus BEECRYPT_CONF_OPTS += --without-cplusplus