Bump buildroot to 2019.02
This commit is contained in:
@@ -1,32 +0,0 @@
|
||||
From da2793fcde5c4e3ff448b4b21348ef8b1482c678 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 16 Jan 2018 14:51:32 +0100
|
||||
Subject: [PATCH] fix build with g++5
|
||||
|
||||
Patch needed to build domoticz
|
||||
|
||||
Patch fetch from one of the answer of
|
||||
https://github.com/domoticz/domoticz/issues/2034:
|
||||
workaround suggested to the boost developers
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
boost/asio/detail/consuming_buffers.hpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/boost/asio/detail/consuming_buffers.hpp b/boost/asio/detail/consuming_buffers.hpp
|
||||
index a429f97..b7a887c 100644
|
||||
--- a/boost/asio/detail/consuming_buffers.hpp
|
||||
+++ b/boost/asio/detail/consuming_buffers.hpp
|
||||
@@ -102,7 +102,7 @@ public:
|
||||
|
||||
std::advance(next, next_elem_);
|
||||
std::size_t elem_offset = next_elem_offset_;
|
||||
- while (next != end && max_size > 0 && result.count < result.max_buffers)
|
||||
+ while (next != end && max_size > 0 && (result.count) < result.max_buffers)
|
||||
{
|
||||
Buffer next_buf = Buffer(*next) + elem_offset;
|
||||
result.elems[result.count] = boost::asio::buffer(next_buf, max_size);
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -57,6 +57,7 @@ config BR2_PACKAGE_BOOST_ATOMIC
|
||||
|
||||
config BR2_PACKAGE_BOOST_CHRONO
|
||||
bool "boost-chrono"
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
help
|
||||
Useful time utilities. C++11.
|
||||
|
||||
@@ -69,22 +70,51 @@ config BR2_PACKAGE_BOOST_CONTAINER
|
||||
# http://www.boost.org/doc/libs/1_59_0/libs/context/doc/html/context/architectures.html
|
||||
# for the list of supported architectures. Sparc pretends to be
|
||||
# supported, but it doesn't build.
|
||||
config BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS
|
||||
bool
|
||||
default y if ((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM)
|
||||
default y if BR2_i386
|
||||
default y if BR2_mips
|
||||
default y if BR2_mipsel
|
||||
default y if BR2_powerpc
|
||||
default y if BR2_x86_64
|
||||
|
||||
config BR2_PACKAGE_BOOST_CONTEXT
|
||||
bool "boost-context"
|
||||
depends on ((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) || \
|
||||
BR2_i386 || BR2_mips || BR2_mipsel || BR2_powerpc || BR2_x86_64
|
||||
depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735
|
||||
select BR2_PACKAGE_BOOST_THREAD if !BR2_TOOLCHAIN_GCC_AT_LEAST_6
|
||||
help
|
||||
C++11 context switching library.
|
||||
|
||||
config BR2_PACKAGE_BOOST_CONTRACT
|
||||
bool "boost-contract"
|
||||
# pthread_condattr_setclock
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
help
|
||||
Contract programming for C++.
|
||||
|
||||
comment "boost-contract needs a toolchain w/ NPTL"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
|
||||
config BR2_PACKAGE_BOOST_COROUTINE
|
||||
bool "boost-coroutine"
|
||||
depends on BR2_PACKAGE_BOOST_CONTEXT
|
||||
depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context
|
||||
select BR2_PACKAGE_BOOST_CHRONO
|
||||
select BR2_PACKAGE_BOOST_CONTEXT
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
select BR2_PACKAGE_BOOST_THREAD
|
||||
help
|
||||
deprecated coroutine library, the non-depricated coroutine2
|
||||
library is a header-only library and does not need to be
|
||||
selected.
|
||||
|
||||
comment "boost-coroutine needs a toolchain not affected by GCC bug 64735"
|
||||
depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
|
||||
|
||||
config BR2_PACKAGE_BOOST_DATE_TIME
|
||||
bool "boost-date_time"
|
||||
help
|
||||
@@ -100,24 +130,37 @@ config BR2_PACKAGE_BOOST_EXCEPTION
|
||||
|
||||
config BR2_PACKAGE_BOOST_FIBER
|
||||
bool "boost-fiber"
|
||||
depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
# mips support uses the "pause" instruction, only available
|
||||
# since mips32r2/mips64r2.
|
||||
depends on !BR2_MIPS_CPU_MIPS32 && !BR2_MIPS_CPU_MIPS64
|
||||
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context
|
||||
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85180
|
||||
select BR2_PACKAGE_BOOST_CONTEXT
|
||||
select BR2_PACKAGE_BOOST_FILESYSTEM
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
help
|
||||
C++11 userland threads library.
|
||||
|
||||
comment "boost-fiber needs a toolchain w/ NPTL"
|
||||
depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
|
||||
comment "boost-fiber needs a toolchain not affected by GCC bug 64735, 85180"
|
||||
depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || BR2_TOOLCHAIN_HAS_GCC_BUG_85180
|
||||
|
||||
config BR2_PACKAGE_BOOST_FILESYSTEM
|
||||
bool "boost-filesystem"
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
help
|
||||
The Boost Filesystem Library provides portable facilities to
|
||||
query and manipulate paths, files, and directories.
|
||||
|
||||
config BR2_PACKAGE_BOOST_GRAPH
|
||||
bool "boost-graph"
|
||||
select BR2_PACKAGE_BOOST_REGEX
|
||||
help
|
||||
The BGL graph interface and graph components are generic, in
|
||||
the same sense as the the Standard Template Library (STL).
|
||||
@@ -147,6 +190,8 @@ config BR2_PACKAGE_BOOST_LOCALE
|
||||
# https://svn.boost.org/trac/boost/ticket/9685 for more
|
||||
# details.
|
||||
depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_ICU)
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
select BR2_PACKAGE_BOOST_THREAD if BR2_PACKAGE_ICU
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
help
|
||||
Provide localization and Unicode handling tools for C++.
|
||||
@@ -158,15 +203,17 @@ comment "boost-locale needs a toolchain w/ dynamic library"
|
||||
config BR2_PACKAGE_BOOST_LOG
|
||||
bool "boost-log"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
# for some reason, uClibc on PowerPC fails to build the boost
|
||||
# log module
|
||||
depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC)
|
||||
select BR2_PACKAGE_BOOST_ATOMIC
|
||||
select BR2_PACKAGE_BOOST_DATE_TIME
|
||||
select BR2_PACKAGE_BOOST_FILESYSTEM
|
||||
select BR2_PACKAGE_BOOST_REGEX
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
select BR2_PACKAGE_BOOST_THREAD
|
||||
help
|
||||
Logging library.
|
||||
|
||||
comment "boost-log needs a toolchain w/ NPTL"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC)
|
||||
|
||||
config BR2_PACKAGE_BOOST_MATH
|
||||
bool "boost-math"
|
||||
@@ -217,6 +264,7 @@ config BR2_PACKAGE_BOOST_PYTHON
|
||||
|
||||
config BR2_PACKAGE_BOOST_RANDOM
|
||||
bool "boost-random"
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
help
|
||||
A complete system for random number generation.
|
||||
|
||||
@@ -231,11 +279,6 @@ config BR2_PACKAGE_BOOST_SERIALIZATION
|
||||
help
|
||||
Serialization for persistence and marshalling.
|
||||
|
||||
config BR2_PACKAGE_BOOST_SIGNALS
|
||||
bool "boost-signals"
|
||||
help
|
||||
Managed signals & slots callback implementation.
|
||||
|
||||
config BR2_PACKAGE_BOOST_STACKTRACE
|
||||
bool "boost-stacktrace"
|
||||
depends on !BR2_STATIC_LIBS
|
||||
@@ -254,22 +297,31 @@ config BR2_PACKAGE_BOOST_SYSTEM
|
||||
config BR2_PACKAGE_BOOST_TEST
|
||||
bool "boost-test"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
select BR2_PACKAGE_BOOST_TIMER
|
||||
help
|
||||
Support for simple program testing, full unit testing, and for
|
||||
program execution monitoring.
|
||||
|
||||
config BR2_PACKAGE_BOOST_THREAD
|
||||
bool "boost-thread"
|
||||
select BR2_PACKAGE_BOOST_ATOMIC if !BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
|
||||
select BR2_PACKAGE_BOOST_CHRONO
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
help
|
||||
Portable C++ multi-threading. C++11, C++14.
|
||||
|
||||
config BR2_PACKAGE_BOOST_TIMER
|
||||
bool "boost-timer"
|
||||
select BR2_PACKAGE_BOOST_CHRONO
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
help
|
||||
Event timer, progress timer, and progress display classes.
|
||||
|
||||
config BR2_PACKAGE_BOOST_TYPE_ERASURE
|
||||
bool "boost-type_erasure"
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
select BR2_PACKAGE_BOOST_THREAD
|
||||
help
|
||||
Runtime polymorphism based on concepts.
|
||||
|
||||
@@ -278,6 +330,10 @@ config BR2_PACKAGE_BOOST_WAVE
|
||||
# limitation of assembler for coldfire
|
||||
# error: Tried to convert PC relative branch to absolute jump
|
||||
depends on !BR2_m68k_cf
|
||||
select BR2_PACKAGE_BOOST_DATE_TIME
|
||||
select BR2_PACKAGE_BOOST_FILESYSTEM
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
select BR2_PACKAGE_BOOST_THREAD
|
||||
help
|
||||
The Boost.Wave library is a Standards conformant, and highly
|
||||
configurable implementation of the mandated C99/C++
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From http://www.boost.org/users/history/version_1_66_0.html
|
||||
sha256 5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9 boost_1_66_0.tar.bz2
|
||||
# From http://www.boost.org/users/history/version_1_69_0.html
|
||||
sha256 8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406 boost_1_69_0.tar.bz2
|
||||
|
||||
# Locally computed
|
||||
sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BOOST_VERSION = 1.66.0
|
||||
BOOST_VERSION = 1.69.0
|
||||
BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2
|
||||
BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION)
|
||||
BOOST_INSTALL_STAGING = YES
|
||||
@@ -14,15 +14,15 @@ BOOST_LICENSE_FILES = LICENSE_1_0.txt
|
||||
# keep host variant as minimal as possible
|
||||
HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \
|
||||
--without-libraries=$(subst $(space),$(comma),atomic chrono context \
|
||||
coroutine date_time exception filesystem graph graph_parallel iostreams \
|
||||
locale log math mpi program_options python random regex serialization \
|
||||
signals system test thread timer type_erasure \
|
||||
wave)
|
||||
contract coroutine date_time exception filesystem graph graph_parallel \
|
||||
iostreams locale log math mpi program_options python random regex \
|
||||
serialization system test thread timer type_erasure wave)
|
||||
|
||||
BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic)
|
||||
BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono)
|
||||
BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTAINER),,container)
|
||||
BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTEXT),,context)
|
||||
BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTRACT),,contract)
|
||||
BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_COROUTINE),,coroutine)
|
||||
BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_DATE_TIME),,date_time)
|
||||
BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_EXCEPTION),,exception)
|
||||
@@ -40,7 +40,6 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_PYTHON),,python)
|
||||
BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_RANDOM),,random)
|
||||
BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_REGEX),,regex)
|
||||
BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SERIALIZATION),,serialization)
|
||||
BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SIGNALS),,signals)
|
||||
BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_STACKTRACE),,stacktrace)
|
||||
BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SYSTEM),,system)
|
||||
BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TEST),,test)
|
||||
@@ -158,6 +157,24 @@ define BOOST_INSTALL_STAGING_CMDS
|
||||
--layout=$(BOOST_LAYOUT) install)
|
||||
endef
|
||||
|
||||
# These hooks will help us to detect missing select in Config.in
|
||||
# Indeed boost buildsystem can select a library even if the user has
|
||||
# disable it
|
||||
define BOOST_REMOVE_TARGET_LIBRARIES
|
||||
rm -rf $(TARGET_DIR)/usr/lib/libboost_*
|
||||
endef
|
||||
|
||||
BOOST_PRE_INSTALL_TARGET_HOOKS += BOOST_REMOVE_TARGET_LIBRARIES
|
||||
|
||||
define BOOST_CHECK_TARGET_LIBRARIES
|
||||
@$(foreach disabled,$(BOOST_WITHOUT_FLAGS),\
|
||||
! ls $(TARGET_DIR)/usr/lib/libboost_$(disabled)* 1>/dev/null 2>&1 || \
|
||||
! echo "libboost_$(disabled) shouldn't have been installed: missing select in boost/Config.in" || \
|
||||
exit 1;)
|
||||
endef
|
||||
|
||||
BOOST_POST_INSTALL_TARGET_HOOKS += BOOST_CHECK_TARGET_LIBRARIES
|
||||
|
||||
define HOST_BOOST_CONFIGURE_CMDS
|
||||
(cd $(@D) && ./bootstrap.sh $(HOST_BOOST_FLAGS))
|
||||
echo "using gcc : `$(HOST_CC) -dumpversion` : $(HOSTCXX) : <cxxflags>\"$(HOST_CXXFLAGS)\" <linkflags>\"$(HOST_LDFLAGS)\" ;" > $(@D)/user-config.jam
|
||||
|
||||
Reference in New Issue
Block a user