Skip to contentSkip to conversation

boost: only the iostreams library requires bzip2

PATCH Superseded Will Wagner 1 participant 2 messages Jun 11, 2013

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Will Wagner

author
#0 lore raw

PATCH v2 1/1 boost: only the iostreams library requires bzip2

Signed-off-by Will Wagner <[email protected]>
---
  package/boost/Config.in |    2 +-
  package/boost/boost.mk  |    6 +++++-
  2 files changed, 6 insertions(+), 2 deletions(-)
package/boost/Config.in +1 -1
index 5c65b2f..46b5102 100644
@@ -9,7 +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 +42,7 @@ config BR2_PACKAGE_BOOST_GRAPH_PARALLEL
 
  config BR2_PACKAGE_BOOST_IOSTREAMS
  	bool "boost-iostreams"
+	select BR2_PACKAGE_BZIP2
 
  config BR2_PACKAGE_BOOST_LOCALE
  	depends on BR2_USE_WCHAR
package/boost/boost.mk +5 -1
index d11f378..73eb4b0 100644
@@ -12,7 +12,7 @@ BOOST_INSTALL_STAGING = YES
 
  TARGET_CC_VERSION = $(shell $(TARGET_CC) -dumpversion)
 
-BOOST_DEPENDENCIES = bzip2 zlib
+BOOST_DEPENDENCIES = zlib
 
  BOOST_FLAGS =
 

@@ -48,6 +48,10 @@ else
  BOOST_FLAGS += --without-icu
  endif
 
+ifeq ($(BR2_PACKAGE_BOOST_IOSTREAMS),y)
+BOOST_DEPENDENCIES += bzip2
+endif
+
  BOOST_OPT += toolset=gcc \
  	     threading=multi \
  	     variant=$(if $(BR2_ENABLE_DEBUG),debug,release) \
Signature · 1 line
1.7.2.5
author
#1 lore raw

PATCH v2 1/1 boost: only the iostreams library requires bzip2

Quoted 40 lines · Will Wagner
Signed-off-by Will Wagner <[email protected]>
---
  package/boost/Config.in |    2 +-
  package/boost/boost.mk  |    6 +++++-
  2 files changed, 6 insertions(+), 2 deletions(-)
package/boost/Config.in +1 -1
index 5c65b2f..46b5102 100644
@@ -9,7 +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 +42,7 @@ config BR2_PACKAGE_BOOST_GRAPH_PARALLEL
 
  config BR2_PACKAGE_BOOST_IOSTREAMS
      bool "boost-iostreams"
+    select BR2_PACKAGE_BZIP2
 
  config BR2_PACKAGE_BOOST_LOCALE
      depends on BR2_USE_WCHAR
package/boost/boost.mk +1 -1
index d11f378..73eb4b0 100644
@@ -12,7 +12,7 @@ BOOST_INSTALL_STAGING = YES
 
  TARGET_CC_VERSION = $(shell $(TARGET_CC) -dumpversion)
 
-BOOST_DEPENDENCIES = bzip2 zlib
+BOOST_DEPENDENCIES = zlib
 
  BOOST_FLAGS =

package/boost/boost.mk else · line 57

Quoted 10 lines
package/boost/boost.mk +4 -0
@@ -48,6 +48,10 @@ else
  BOOST_FLAGS += --without-icu
  endif
 
+ifeq ($(BR2_PACKAGE_BOOST_IOSTREAMS),y)
+BOOST_DEPENDENCIES += bzip2
+endif
+
  BOOST_OPT += toolset=gcc \
           threading=multi \
           variant=$(if $(BR2_ENABLE_DEBUG),debug,release) \

Having just looked at the boost source code again I realise that zlib is also only needed for iostreams lib. I'll update the patch and resubmit.

Regards
Will

Signature · 5 lines
------------------------------------------------------------------------
Will Wagner                                     will_wagner at carallon.com
Development Manager                      Office Tel: +44 (0)20 7471 9224
Carallon Ltd, Studio G20, Shepherds Building, Rockley Rd, London W14 0DA
------------------------------------------------------------------------