Skip to contentSkip to conversation

boost: only the iostreams library requires bzip2 and zlib

PATCH New Will Wagner 2 participants 2 messages Jun 11, 2013

lore
Share & tools
lore

Will Wagner

author
#0 lore raw

PATCH v3 1/1 boost: only the iostreams library requires bzip2 and zlib

Signed-off-by Will Wagner <[email protected]>
---
  package/boost/Config.in |    4 ++--
  package/boost/boost.mk  |    6 +++++-
  2 files changed, 7 insertions(+), 3 deletions(-)
package/boost/Config.in +2 -2
index 5c65b2f..912717a 100644
@@ -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
package/boost/boost.mk +5 -1
index d11f378..33993c4 100644
@@ -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) \
Signature · 1 line
1.7.2.5
#1 lore raw

PATCH v3 1/1 boost: only the iostreams library requires bzip2 and zlib

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Will" == Will Wagner <[email protected]> writes:

Will> Signed-off-by: Will Wagner <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard