Skip to contentSkip to conversation

botan: fix static build

PATCH Superseded Francois Perrad 4 participants 4 messages Nov 25, 2014 – Nov 26, 2014

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 botan: fix static build

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

---
 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 1/1 botan: fix static build

Hi Francois,

Quoted 1 line · Francois Perrad

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

Please mention in the commit log that this reverts commit 84047394ed6ad08adb9f59a9022553a327eef040. Elaborating a bit on --no-autoload would also be nice.

baruch

Quoted 38 lines
---
 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 · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
#2 lore raw

PATCH 1/1 botan: fix static build

2014-11-25 17:42 GMT+01:00 Baruch Siach <[email protected]>:

Quoted 9 lines

Hi Francois,

Quoted 1 line · Francois Perrad

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

Please mention in the commit log that this reverts commit 84047394ed6ad08adb9f59a9022553a327eef040. Elaborating a bit on --no-autoload would also be nice.

You are right. This patch contains a real fix in botan.mk and reverts the previous commit which only disables BR2_PREFER_STATIC_LIB in Config.in

Fran?ois

Quoted 49 lines

baruch

Quoted 30 lines
---
 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 +0 -0
index ae0e02d..2e47eb6 100644

package/botan/botan.mk BOTAN_CONF_OPTS = \ · line 26

Quoted 8 lines
package/botan/botan.mk +1 -1
@@ -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)

--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#3 lore raw

PATCH 1/1 botan: fix static build

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fran?ois" == Fran?ois Perrad <[email protected]> writes:

2014-11-25 17:42 GMT+01:00 Baruch Siach <[email protected]>:

Quoted 5 lines

Hi Francois,

Quoted 1 line · Francois Perrad

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

Quoted 8 lines
Quoted 4 lines

Please mention in the commit log that this reverts commit 84047394ed6ad08adb9f59a9022553a327eef040. Elaborating a bit on --no-autoload would also be nice.

You are right. This patch contains a real fix in botan.mk and reverts the previous commit which only disables BR2_PREFER_STATIC_LIB in Config.in

So what does --no-autoload do?

Signature · 1 line
Bye, Peter Korsgaard