Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -1,31 +0,0 @@
|
||||
configure: Use AC_COMPILE_IFELSE for ICU check for cross compilation compat
|
||||
|
||||
AC_RUN_IFELSE doesn't work when cross compiling, but we can do the
|
||||
check in the preprocessor instead, so use AC_COMPILE_IFELSE instead.
|
||||
|
||||
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
|
||||
---
|
||||
configure.ac | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
Index: beecrypt-4.2.1/configure.ac
|
||||
===================================================================
|
||||
--- beecrypt-4.2.1.orig/configure.ac
|
||||
+++ beecrypt-4.2.1/configure.ac
|
||||
@@ -295,13 +295,13 @@
|
||||
if test "$ac_with_cplusplus" = yes; then
|
||||
AC_MSG_CHECKING([for IBM's ICU library version >= 2.8])
|
||||
AC_LANG_PUSH(C)
|
||||
- AC_RUN_IFELSE([
|
||||
+ AC_COMPILE_IFELSE([
|
||||
AC_LANG_PROGRAM([[#include <unicode/uversion.h>]],[[
|
||||
#if U_ICU_VERSION_MAJOR_NUM < 2
|
||||
- exit(1);
|
||||
+ #error too old
|
||||
#elif U_ICU_VERSION_MAJOR_NUM == 2
|
||||
# if U_ICU_VERSION_MINOR_NUM < 8
|
||||
- exit(1);
|
||||
+ #error too old
|
||||
# else
|
||||
exit(0);
|
||||
# endif
|
||||
@@ -1,19 +0,0 @@
|
||||
Really fixes gcc-4.7 related compile error:
|
||||
../../include/beecrypt/c++/util/AbstractSet.h:59:27: error: 'containsAll' was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation [-fpermissive]
|
||||
|
||||
Downloaded from upstream bugtracker:
|
||||
http://sourceforge.net/p/beecrypt/patches/10/
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
--- a/include/beecrypt/c++/util/AbstractSet.h
|
||||
+++ b/include/beecrypt/c++/util/AbstractSet.h
|
||||
@@ -56,7 +56,7 @@
|
||||
if (c->size() != size())
|
||||
return false;
|
||||
|
||||
- return containsAll(*c);
|
||||
+ return this->containsAll(*c);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@@ -8,22 +8,3 @@ config BR2_PACKAGE_BEECRYPT
|
||||
Beecrypt is a general-purpose cryptography library.
|
||||
|
||||
http://beecrypt.sf.net
|
||||
|
||||
if BR2_PACKAGE_BEECRYPT
|
||||
|
||||
config BR2_PACKAGE_BEECRYPT_CPP
|
||||
bool "C++ support"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_USE_WCHAR # icu
|
||||
depends on !BR2_BINFMT_FLAT # icu
|
||||
depends on !BR2_STATIC_LIBS
|
||||
select BR2_PACKAGE_ICU
|
||||
help
|
||||
Enable C++ support. This pulls in the (large) icu package.
|
||||
|
||||
comment "C++ support needs a toolchain w/ C++, wchar, dynamic libraries"
|
||||
depends on !BR2_BINFMT_FLAT
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \
|
||||
|| BR2_STATIC_LIBS
|
||||
|
||||
endif # BR2_PACKAGE_BEECRYPT
|
||||
|
||||
@@ -8,14 +8,15 @@ BEECRYPT_VERSION = 4.2.1
|
||||
BEECRYPT_SITE = http://downloads.sourceforge.net/project/beecrypt/beecrypt/$(BEECRYPT_VERSION)
|
||||
BEECRYPT_AUTORECONF = YES
|
||||
BEECRYPT_INSTALL_STAGING = YES
|
||||
BEECRYPT_LICENSE = LGPLv2.1+
|
||||
BEECRYPT_LICENSE = LGPL-2.1+
|
||||
BEECRYPT_LICENSE_FILES = COPYING.LIB
|
||||
|
||||
BEECRYPT_CONF_OPTS = \
|
||||
--disable-expert-mode \
|
||||
--without-java \
|
||||
--without-python \
|
||||
--disable-openmp
|
||||
--disable-openmp \
|
||||
--without-cplusplus
|
||||
|
||||
# disable optimized m68k assembly as it doesn't compile for coldfire
|
||||
ifeq ($(BR2_m68k_cf),y)
|
||||
@@ -27,19 +28,11 @@ ifeq ($(BR2_arm):$(BR2_ARM_CPU_HAS_ARM),y:)
|
||||
BEECRYPT_CONF_OPTS += --enable-debug
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BEECRYPT_CPP),y)
|
||||
BEECRYPT_DEPENDENCIES += icu
|
||||
BEECRYPT_CONF_OPTS += --with-cplusplus
|
||||
else
|
||||
BEECRYPT_CONF_OPTS += --without-cplusplus
|
||||
|
||||
# automake/libtool uses the C++ compiler to link libbeecrypt because of
|
||||
# (the optional) cppglue.cxx. Force it to use the C compiler instead.
|
||||
define BEECRYPT_LINK_WITH_CC
|
||||
$(SED) 's/--tag=CXX/--tag=CC/g' $(@D)/Makefile
|
||||
endef
|
||||
|
||||
BEECRYPT_POST_CONFIGURE_HOOKS += BEECRYPT_LINK_WITH_CC
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user