| Message ID | 1416932097-12474-1-git-send-email-francois.perrad@gadz.org |
|---|---|
| State | Accepted |
| Commit | f824d3e2bebfab9ae746e605b65a852c68f55152 |
| Headers | show |
Hi Francois, On Tue, Nov 25, 2014 at 05:14:57PM +0100, Francois Perrad wrote: > 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 > Signed-off-by: Francois Perrad <francois.perrad@gadz.org> > --- > package/botan/Config.in | 5 ++--- > package/botan/botan.mk | 2 +- > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/package/botan/Config.in b/package/botan/Config.in > index c82a77f..733dc89 100644 > --- 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 ae0e02d..2e47eb6 100644 > --- 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)
2014-11-25 17:42 GMT+01:00 Baruch Siach <baruch@tkos.co.il>: > Hi Francois, > > On Tue, Nov 25, 2014 at 05:14:57PM +0100, Francois Perrad wrote: >> 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 > baruch > >> Signed-off-by: Francois Perrad <francois.perrad@gadz.org> >> --- >> package/botan/Config.in | 5 ++--- >> package/botan/botan.mk | 2 +- >> 2 files changed, 3 insertions(+), 4 deletions(-) >> >> diff --git a/package/botan/Config.in b/package/botan/Config.in >> index c82a77f..733dc89 100644 >> --- 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 ae0e02d..2e47eb6 100644 >> --- 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) > > -- > http://baruch.siach.name/blog/ ~. .~ Tk Open Systems > =}------------------------------------------------ooO--U--Ooo------------{= > - baruch@tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il - > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
>>>>> "François" == François Perrad <francois.perrad@gadz.org> writes: > 2014-11-25 17:42 GMT+01:00 Baruch Siach <baruch@tkos.co.il>: >> Hi Francois, >> >> On Tue, Nov 25, 2014 at 05:14:57PM +0100, Francois Perrad wrote: >>> 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 So what does --no-autoload do?
diff --git a/package/botan/Config.in b/package/botan/Config.in index c82a77f..733dc89 100644 --- 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 ae0e02d..2e47eb6 100644 --- 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)
see http://autobuild.buildroot.net/results/2d1/2d1563e253b669b45c9df449c5b3a750c04a43dc/ Signed-off-by: Francois Perrad <francois.perrad@gadz.org> --- package/botan/Config.in | 5 ++--- package/botan/botan.mk | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-)