Skip to contentSkip to conversation

botan: fix static build

PATCH New Francois Perrad 2 participants 2 messages Nov 27, 2014

lore
Share & tools
lore

Francois Perrad

author
#0 lore raw

PATCH v2 1/1 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 <[email protected]>
---
 package/botan/Config.in | 5 ++---
 package/botan/botan.mk  | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)
package/botan/Config.in +2 -3
index c82a77f..733dc89 100644
@@ -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
package/botan/botan.mk +1 -1
index ae0e02d..2e47eb6 100644
@@ -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)
Signature · 1 line
2.1.0
#1 lore raw

PATCH v2 1/1 botan: fix static build

Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Francois" == Francois Perrad <[email protected]> writes:

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 <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard