From 87dfeb10ad8aa0c52b20cd1baa05f7403656ca98 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 15 Jan 2013 00:45:26 +0000 Subject: boost: fix build problem by always building a threaded version Boost normally allows to build a non-threaded variant by passing threading=single or a multi-threaded variant by passing threading=multi. Unfortunately, the build of threading=single doesn't seem to work any more, due to bizarre things in the build system. We get "duplicate target" errors, that according to http://lists.boost.org/boost-build/2012/11/26582.php should appear if we ask for both threading=single,multi. But it seems to happen even in the threading=single case. Since Boost is such a big C++ beast, it probably doesn't make much sense to try to support it on toolchains that don't have thread support. So, we make the boost package depend on thread support. If someone cares enough in getting Boost to work in a non-threaded environment, then we can always revert back. Note that the boost package has no reverse dependencies in Buildroot, so we don't need to propagate this new dependency anywhere. Fixes: http://autobuild.buildroot.org/results/439e72ac74c8058f30977e6abc39acd6379a17d3/build-end.log Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/boost/boost.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/boost/boost.mk') diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 005c7ca75..62226ba22 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -46,10 +46,10 @@ BOOST_FLAGS += --without-icu endif BOOST_OPT += toolset=gcc \ + threading=multi \ variant=$(if $(BR2_ENABLE_DEBUG),debug,release) \ link=$(if $(BR2_PREFER_STATIC_LIB),static,shared) \ - runtime-link=$(if $(BR2_PREFER_STATIC_LIB),static,shared) \ - threading=$(if $(BR2_PACKAGE_BOOST_MULTITHREADED),multi,single) + runtime-link=$(if $(BR2_PREFER_STATIC_LIB),static,shared) ifeq ($(BR2_PACKAGE_BOOST_LOCALE),y) ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y) -- cgit v1.2.3