Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Will Wagner <will_wagner@carallon.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2] boost: only the iostreams library requires bzip2
Date: Tue, 11 Jun 2013 07:51:46 +0100	[thread overview]
Message-ID: <51B6C902.6000101@carallon.com> (raw)

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
  package/boost/Config.in |    2 +-
  package/boost/boost.mk  |    6 +++++-
  2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/package/boost/Config.in b/package/boost/Config.in
index 5c65b2f..46b5102 100644
--- a/package/boost/Config.in
+++ b/package/boost/Config.in
@@ -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
diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index d11f378..73eb4b0 100644
--- 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 = 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) \
-- 
1.7.2.5

             reply	other threads:[~2013-06-11  6:51 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-11  6:51 Will Wagner [this message]
2013-06-11  6:55 ` [Buildroot] [PATCH v2] boost: only the iostreams library requires bzip2 Will Wagner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=51B6C902.6000101@carallon.com \
    --to=will_wagner@carallon.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox