Bump buildroot to 2019.02
This commit is contained in:
@@ -3,15 +3,17 @@ Remove explicit mips64 -mabi parameter
|
||||
This breaks when building for n32 ABI on mips64.
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
[Bernd: rebased for botan-2.7.0]
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
|
||||
diff -Nuar Botan-1.10.8-orig/src/build-data/cc/gcc.txt Botan-1.10.8/src/build-data/cc/gcc.txt
|
||||
--- Botan-1.10.8-orig/src/build-data/cc/gcc.txt 2014-04-10 17:11:44.000000000 +0300
|
||||
+++ Botan-1.10.8/src/build-data/cc/gcc.txt 2014-10-23 09:20:34.506722323 +0300
|
||||
@@ -92,7 +92,6 @@
|
||||
# The 'linking' bit means "use this for both compiling *and* linking"
|
||||
<mach_abi_linking>
|
||||
x86_64 -> "-m64"
|
||||
@@ -83,7 +83,6 @@
|
||||
|
||||
openmp -> "-fopenmp"
|
||||
|
||||
-mips64 -> "-mabi=64"
|
||||
s390 -> "-m31"
|
||||
s390x -> "-m64"
|
||||
|
||||
@@ -8,13 +8,22 @@ config BR2_PACKAGE_BOTAN_ARCH_SUPPORTS
|
||||
config BR2_PACKAGE_BOTAN
|
||||
bool "botan"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future
|
||||
select BR2_PACKAGE_BOOST_FILESYSTEM if BR2_PACKAGE_BOOST
|
||||
select BR2_PACKAGE_BOOST_SYSTEM if BR2_PACKAGE_BOOST
|
||||
help
|
||||
Botan is a crypto library for C++
|
||||
|
||||
http://botan.randombit.net
|
||||
|
||||
comment "botan needs a toolchain w/ C++, threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
|
||||
comment "botan needs a toolchain w/ C++, threads, gcc >= 4.8"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \
|
||||
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
|
||||
depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS
|
||||
|
||||
comment "botan needs a toolchain not affected by GCC bug 64735"
|
||||
depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
|
||||
|
||||
@@ -1,2 +1,4 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 6c5472401d06527e87adcb53dd270f3c9b1fb688703b04dd7a7cfb86289efe52 Botan-1.10.16.tgz
|
||||
# From https://botan.randombit.net/releases/sha256sums.txt
|
||||
sha256 e7159b127e91e0c158245d61c638c50d443ec7b440b6b0161328c47b3aba3960 Botan-2.8.0.tgz
|
||||
# Locally computed
|
||||
sha256 40cfd35a9e34d18463806f57553c968fdbaf254a2e2a636d1d8e32ff6b698495 license.txt
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BOTAN_VERSION = 1.10.16
|
||||
BOTAN_VERSION = 2.8.0
|
||||
BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tgz
|
||||
BOTAN_SITE = http://botan.randombit.net/releases
|
||||
BOTAN_LICENSE = BSD-2-Clause
|
||||
BOTAN_LICENSE_FILES = doc/license.txt
|
||||
BOTAN_LICENSE_FILES = license.txt
|
||||
|
||||
BOTAN_INSTALL_STAGING = YES
|
||||
|
||||
@@ -17,10 +17,44 @@ BOTAN_CONF_OPTS = \
|
||||
--os=linux \
|
||||
--cc=gcc \
|
||||
--cc-bin="$(TARGET_CXX)" \
|
||||
--prefix=/usr
|
||||
--ldflags="$(BOTAN_LDFLAGS)" \
|
||||
--prefix=/usr \
|
||||
--without-documentation
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
BOTAN_CONF_OPTS += --disable-shared --no-autoload
|
||||
BOTAN_LDFLAGS = $(TARGET_LDFLAGS)
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
BOTAN_LDFLAGS += -latomic
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_SHARED_LIBS),y)
|
||||
BOTAN_CONF_OPTS += \
|
||||
--disable-static-library \
|
||||
--enable-shared-library
|
||||
else ifeq ($(BR2_STATIC_LIBS),y)
|
||||
BOTAN_CONF_OPTS += \
|
||||
--disable-shared-library \
|
||||
--enable-static-library \
|
||||
--no-autoload
|
||||
else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
|
||||
BOTAN_CONF_OPTS += \
|
||||
--enable-shared-library \
|
||||
--enable-static-library
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_SSP),y)
|
||||
BOTAN_CONF_OPTS += --with-stack-protector
|
||||
else
|
||||
BOTAN_CONF_OPTS += --without-stack-protector
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
|
||||
BOTAN_CONF_OPTS += --without-os-feature=getauxval
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BOOST),y)
|
||||
BOTAN_DEPENDENCIES += boost
|
||||
BOTAN_CONF_OPTS += --with-boost
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BZIP2),y)
|
||||
@@ -28,41 +62,48 @@ BOTAN_DEPENDENCIES += bzip2
|
||||
BOTAN_CONF_OPTS += --with-bzip2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GMP),y)
|
||||
BOTAN_DEPENDENCIES += gmp
|
||||
BOTAN_CONF_OPTS += --with-gnump
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
BOTAN_DEPENDENCIES += openssl
|
||||
BOTAN_CONF_OPTS += --with-openssl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SQLITE),y)
|
||||
BOTAN_DEPENDENCIES += sqlite
|
||||
BOTAN_CONF_OPTS += --with-sqlite
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XZ),y)
|
||||
BOTAN_DEPENDENCIES += xz
|
||||
BOTAN_CONF_OPTS += --with-lzma
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
BOTAN_DEPENDENCIES += zlib
|
||||
BOTAN_CONF_OPTS += --with-zlib
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
|
||||
BOTAN_CONF_OPTS += --enable-altivec
|
||||
else
|
||||
ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),)
|
||||
BOTAN_CONF_OPTS += --disable-altivec
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_ARM_CPU_HAS_NEON),)
|
||||
BOTAN_CONF_OPTS += --disable-neon
|
||||
endif
|
||||
|
||||
define BOTAN_CONFIGURE_CMDS
|
||||
(cd $(@D); $(TARGET_MAKE_ENV) ./configure.py $(BOTAN_CONF_OPTS))
|
||||
endef
|
||||
|
||||
define BOTAN_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) AR="$(TARGET_AR) crs"
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) AR="$(TARGET_AR)"
|
||||
endef
|
||||
|
||||
define BOTAN_INSTALL_STAGING_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)/usr" install
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)" install
|
||||
endef
|
||||
|
||||
define BOTAN_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)/usr" install
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
||||
Reference in New Issue
Block a user