From patchwork Tue Jun 11 06:51:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Wagner X-Patchwork-Id: 250456 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 8541C2C0099 for ; Tue, 11 Jun 2013 16:51:58 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8B9D410267C; Tue, 11 Jun 2013 06:51:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mNEkZm96nuE6; Tue, 11 Jun 2013 06:51:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id EAF851027D6; Tue, 11 Jun 2013 06:51:52 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id AB55A8F79F for ; Tue, 11 Jun 2013 06:51:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 75EA68B405 for ; Tue, 11 Jun 2013 06:51:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9egNR4-q3Hhp for ; Tue, 11 Jun 2013 06:51:51 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.carallon.com (mail.carallon.com [95.177.28.122]) by whitealder.osuosl.org (Postfix) with ESMTP id B862C8B296 for ; Tue, 11 Jun 2013 06:51:50 +0000 (UTC) X-MDAV-Result: clean X-MDAV-Processed: mail.carallon.com, Tue, 11 Jun 2013 07:51:49 +0100 Received: from [172.20.1.8] by mail.carallon.com (Cipher TLSv1:-SHA:128) (MDaemon PRO v13.0.5) with ESMTP id md50001307327.msg for ; Tue, 11 Jun 2013 07:51:47 +0100 X-Spam-Processed: mail.carallon.com, Tue, 11 Jun 2013 07:51:47 +0100 (not processed: message from trusted or authenticated source) X-Authenticated-Sender: willw@carallon.com X-MDRemoteIP: 172.20.1.8 X-Return-Path: will_wagner@carallon.com X-Envelope-From: will_wagner@carallon.com X-MDaemon-Deliver-To: buildroot@busybox.net Message-ID: <51B6C902.6000101@carallon.com> Date: Tue, 11 Jun 2013 07:51:46 +0100 From: Will Wagner User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130509 Thunderbird/17.0.6 MIME-Version: 1.0 To: buildroot@busybox.net Subject: [Buildroot] [PATCH v2] boost: only the iostreams library requires bzip2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Will Wagner --- 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) \