summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabrice Fontaine <fontaine.fabrice@gmail.com>2018-06-24 18:24:43 (GMT)
committerPeter Korsgaard <peter@korsgaard.com>2018-06-24 21:54:28 (GMT)
commit4da82c82364c75da9d8e011ffd73aaabe91b3106 (patch)
tree3e03b865568d1d6ddf003e77b7396356ae38170e
parent6be346cec40dda8ab762e11471fa6ff951fdbfa0 (diff)
downloadbuildroot-4da82c82364c75da9d8e011ffd73aaabe91b3106.tar.gz
buildroot-4da82c82364c75da9d8e011ffd73aaabe91b3106.tar.bz2
boost: add option for contract library
Contract library has been added in boost 1.67 and depends on NPTL Fixes: - http://autobuild.buildroot.net/results/a3dd35cfa50a1862c585a648298351c0aba257db Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/boost/Config.in10
-rw-r--r--package/boost/boost.mk7
2 files changed, 14 insertions, 3 deletions
diff --git a/package/boost/Config.in b/package/boost/Config.in
index ec0e19c..781bc47 100644
--- a/package/boost/Config.in
+++ b/package/boost/Config.in
@@ -77,6 +77,16 @@ config BR2_PACKAGE_BOOST_CONTEXT
help
C++11 context switching library.
+config BR2_PACKAGE_BOOST_CONTRACT
+ bool "boost-contract"
+ # pthread_condattr_setclock
+ depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
+ 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
diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index 981d701..cf0cea7 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -14,15 +14,16 @@ 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 \
+ contract 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)
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)