botan: fix static build

see http://autobuild.buildroot.net/results/2d1/2d1563e253b669b45c9df449c5b3a750c04a43dc/

this commit reverts the previous commit 84047394ed6ad08adb9f59a9022553a327eef040
which disables static build in Config.in

the option --no-autoload prevents the use of the function dlopen.

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/botan/Config.in b/package/botan/Config.in
index c82a77fb20ec555e4456083e17cca19162fbb571..733dc8965a1b986a82b6357030a123d077a398f3 100644 (file)
--- a/package/botan/Config.in
+++ b/package/botan/Config.in
@@ -10,12 +10,11 @@ config BR2_PACKAGE_BOTAN
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS
-       depends on !BR2_PREFER_STATIC_LIB # dlfcn.h
        help
          Botan is a crypto library for C++
 
          http://botan.randombit.net
 
-comment "botan needs a toolchain w/ C++, threads, dynamic library"
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || BR2_PREFER_STATIC_LIB
+comment "botan needs a toolchain w/ C++, threads"
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
        depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS

diff --git a/package/botan/botan.mk b/package/botan/botan.mk
index ae0e02dbd33d1da733cd41a6359a11e0f0cd29e3..2e47eb6e879bf3c5a20b7e75d347565c6be7c18f 100644 (file)
--- a/package/botan/botan.mk
+++ b/package/botan/botan.mk
@@ -20,7 +20,7 @@ BOTAN_CONF_OPTS = \
        --cc-bin="$(TARGET_CXX)"
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
-       BOTAN_CONF_OPTS += --disable-shared
+       BOTAN_CONF_OPTS += --disable-shared --no-autoload
 endif
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)