boost: only the iostreams library requires bzip2 and zlib

Signed-off-by: Will Wagner <will_wagner@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/boost/Config.in b/package/boost/Config.in
index 5c65b2fbf4df402d04cbba61fc71016067fb6967..912717ad3bb69494a1920518d75cf45e8b68bfd5 100644 (file)
--- a/package/boost/Config.in
+++ b/package/boost/Config.in
@@ -9,8 +9,6 @@ config BR2_PACKAGE_BOOST
        # that unfortunately doesn't work. Until someone fixes that,
        # let's depend on threads.
        depends on BR2_TOOLCHAIN_HAS_THREADS
-       select BR2_PACKAGE_BZIP2
-       select BR2_PACKAGE_ZLIB
        help
          A general purpose C++ library
 
@@ -43,6 +41,8 @@ config BR2_PACKAGE_BOOST_GRAPH_PARALLEL
 
 config BR2_PACKAGE_BOOST_IOSTREAMS
        bool "boost-iostreams"
+       select BR2_PACKAGE_BZIP2
+       select BR2_PACKAGE_ZLIB
 
 config BR2_PACKAGE_BOOST_LOCALE
        depends on BR2_USE_WCHAR

diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index 57d021ae4e140608929da62963245194698371a5..ce729901a4cecca6ee0d1292bf724f612f40fdb6 100644 (file)
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -12,7 +12,7 @@ BOOST_INSTALL_STAGING = YES
 
 TARGET_CC_VERSION = $(shell $(TARGET_CC) -dumpversion)
 
-BOOST_DEPENDENCIES = bzip2 zlib
+BOOST_DEPENDENCIES =
 
 BOOST_FLAGS =
 
@@ -48,6 +48,10 @@ else
 BOOST_FLAGS += --without-icu
 endif
 
+ifeq ($(BR2_PACKAGE_BOOST_IOSTREAMS),y)
+BOOST_DEPENDENCIES += bzip2 zlib
+endif
+
 BOOST_OPT += toolset=gcc \
             threading=multi \
             variant=$(if $(BR2_ENABLE_DEBUG),debug,release) \