From patchwork Tue Mar 4 16:53:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Derycke X-Patchwork-Id: 326405 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 66FDD2C00C3 for ; Wed, 5 Mar 2014 03:55:16 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A0E8E9643E; Tue, 4 Mar 2014 16:55:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MtpaV9aodFmU; Tue, 4 Mar 2014 16:55:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 238CD9643F; Tue, 4 Mar 2014 16:55:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 2FE7C1BF838 for ; Tue, 4 Mar 2014 16:55:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2BD1E336DA for ; Tue, 4 Mar 2014 16:55:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kfL7hMJq7Xfc for ; Tue, 4 Mar 2014 16:55:11 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail1.bemta12.messagelabs.com (mail1.bemta12.messagelabs.com [216.82.251.13]) by silver.osuosl.org (Postfix) with ESMTP id E03A733721 for ; Tue, 4 Mar 2014 16:55:10 +0000 (UTC) Received: from [216.82.249.147:50261] by server-13.bemta-12.messagelabs.com id FF/30-24704-D6506135; Tue, 04 Mar 2014 16:55:09 +0000 X-Env-Sender: johan.derycke@barco.com X-Msg-Ref: server-10.tower-29.messagelabs.com!1393952072!27994589!1 X-Originating-IP: [91.183.172.68] X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6604 invoked from network); 4 Mar 2014 16:54:33 -0000 Received: from 68.172-183-91.adsl-static.isp.belgacom.be (HELO KUUFEX01.barco.com) (91.183.172.68) by server-10.tower-29.messagelabs.com with SMTP; 4 Mar 2014 16:54:33 -0000 thread-index: Ac83ymnM9fClZSgaQH2SQCyptx6FmQ== Received: from KUUBLD07.barco.com ([10.193.252.31]) by KUUFEX01.barco.com with Microsoft SMTPSVC(6.0.3790.4675); Tue, 4 Mar 2014 17:54:31 +0100 From: "Johan Derycke" To: Content-Class: urn:content-classes:message Importance: normal Priority: normal X-MimeOLE: Produced By Microsoft MimeOLE V6.00.3790.4913 Date: Tue, 4 Mar 2014 17:53:47 +0100 Message-ID: <1393952027-21201-2-git-send-email-johan.derycke@barco.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1393952027-21201-1-git-send-email-johan.derycke@barco.com> References: <1393952027-21201-1-git-send-email-johan.derycke@barco.com> X-OriginalArrivalTime: 04 Mar 2014 16:54:31.0372 (UTC) FILETIME=[69B980C0:01CF37CA] Cc: Johan Derycke Subject: [Buildroot] [PATCH v3 2/2] boost: make build with python an option 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Add an option to boost to build the Boost.Python library. http://www.boost.org/doc/libs/1_55_0/libs/python/doc/index.html Signed-off-by: Johan Derycke --- Changes v2 -> v3: -Avoid line-wrap using "git send-email" Changes v1 -> v2: -Fixed indentations and blank lines -Removed package/Config.in -Allow build with python3 package/boost/Config.in | 4 ++++ package/boost/boost.mk | 13 +++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTEXT),,context) @@ -40,6 +40,7 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_LOCALE),,locale) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_MATH),,math) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_MPI),,mpi) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_PROGRAM_OPTIONS),,program_options) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_PYTHON),,python) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_RANDOM),,random) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_REGEX),,regex) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SERIALIZATION),,serialization) @@ -50,6 +51,8 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_THREAD),,thread) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TIMER),,timer) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_WAVE),,wave) +BOOST_TARGET_CXXFLAGS = $(TARGET_CXXFLAGS) + ifeq ($(BR2_PACKAGE_ICU),y) BOOST_FLAGS += --with-icu=$(STAGING_DIR)/usr BOOST_DEPENDENCIES += icu @@ -61,6 +64,12 @@ ifeq ($(BR2_PACKAGE_BOOST_IOSTREAMS),y) BOOST_DEPENDENCIES += bzip2 zlib endif +ifeq ($(BR2_PACKAGE_BOOST_PYTHON),y) +BOOST_FLAGS += --with-python-root=$(HOST_DIR) +BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)/ +BOOST_DEPENDENCIES += python +endif + HOST_BOOST_OPT += toolset=gcc threading=multi variant=release link=shared \ runtime-link=shared @@ -84,7 +93,7 @@ BOOST_FLAGS += $(if $(BOOST_WITHOUT_FLAGS_COMMASEPERATED), --without-libraries=$ define BOOST_CONFIGURE_CMDS (cd $(@D) && ./bootstrap.sh $(BOOST_FLAGS)) - echo "using gcc : $(TARGET_CC_VERSION) : $(TARGET_CXX) : \"$(TARGET_CXXFLAGS)\" \"$(TARGET_LDFLAGS)\" ;" > $(@D)/user-config.jam + echo "using gcc : $(TARGET_CC_VERSION) : $(TARGET_CXX) : \"$(BOOST_TARGET_CXXFLAGS)\" \"$(TARGET_LDFLAGS)\" ;" > $(@D)/user-config.jam echo "" >> $(@D)/user-config.jam endef diff --git a/package/boost/Config.in b/package/boost/Config.in index 68c3909..a74c2d7 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -60,6 +60,10 @@ config BR2_PACKAGE_BOOST_MPI config BR2_PACKAGE_BOOST_PROGRAM_OPTIONS bool "boost-program_options" +config BR2_PACKAGE_BOOST_PYTHON + depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + bool "boost-python" + config BR2_PACKAGE_BOOST_RANDOM bool "boost-random" diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 7aab614..53d2b4d 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -26,7 +26,7 @@ HOST_BOOST_FLAGS = --without-icu \ # atomic library compile only with upstream version, wait for next release # coroutine breaks on some weak toolchains and it's new for 1.54+ # log breaks with some toolchain combinations and it's new for 1.54+ -BOOST_WITHOUT_FLAGS = atomic coroutine log python +BOOST_WITHOUT_FLAGS = atomic coroutine log BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono)