From patchwork Mon Apr 16 20:01:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 152979 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 7AAE9B6FF7 for ; Tue, 17 Apr 2012 06:02:32 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4DABE32050; Mon, 16 Apr 2012 20:02:31 +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 q9IgGKsLpuyE; Mon, 16 Apr 2012 20:02:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 98E6132059; Mon, 16 Apr 2012 20:02:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 62DD38F78D for ; Mon, 16 Apr 2012 20:02:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5B9491011D4 for ; Mon, 16 Apr 2012 20:02:22 +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 ilpIDYNG90qT for ; Mon, 16 Apr 2012 20:02:21 +0000 (UTC) Received: from busybox.osuosl.org (busybox.osuosl.org [140.211.167.224]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7EE48100D72 for ; Mon, 16 Apr 2012 20:02:21 +0000 (UTC) Received: by busybox.osuosl.org (Postfix, from userid 4021) id 794AB96A12; Mon, 16 Apr 2012 20:02:21 +0000 (UTC) From: Peter Korsgaard To: buildroot@busybox.net Date: Mon, 16 Apr 2012 22:01:17 +0200 X-Git-Refname: refs/heads/master X-Git-Oldrev: 8b354dac5a414a7e335276a53a32b9dcfd61b379 X-Git-Newrev: 581af082c517f77bb998da318a216ecef60480e4 X-Patchwork-Hint: ignore Message-Id: <20120416200221.794AB96A12@busybox.osuosl.org> Subject: [Buildroot] [git commit] boost: cleanup 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 commit: http://git.buildroot.net/buildroot/commit/?id=581af082c517f77bb998da318a216ecef60480e4 branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master Move common staging/target bjam arguments into BOOST_OPT. Signed-off-by: Peter Korsgaard --- package/boost/boost.mk | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 8864bf9..8b8a3cf 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -45,6 +45,12 @@ else BOOST_FLAGS += --without-icu endif +BOOST_OPT += toolset=gcc \ + variant=$(if $(BR2_ENABLE_DEBUG),debug,release) \ + link=$(if $(BR2_PREFER_STATIC_LIB),static,shared) \ + runtime-link=$(if $(BR2_PREFER_STATIC_LIB),static,shared) \ + threading=$(if $(BR2_PACKAGE_BOOST_MULTITHREADED),multi,single) + ifeq ($(BR2_PACKAGE_BOOST_LOCALE),y) ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y) # posix backend needs monetary.h which isn't available on uClibc @@ -54,10 +60,6 @@ endif BOOST_DEPENDENCIES += $(if $(BR2_ENABLE_LOCALE),,libiconv) endif -BOOST_LINK = $(if $(BR2_PREFER_STATIC_LIB),static,shared) -BOOST_MULTI = $(if $(BR2_PACKAGE_BOOST_MULTITHREADED),multi,single) -BOOST_VARIANT = $(if $(BR2_ENABLE_DEBUG),debug,release) - BOOST_WITHOUT_FLAGS_COMMASEPERATED += $(subst $(space),$(comma),$(strip $(BOOST_WITHOUT_FLAGS))) BOOST_FLAGS += $(if $(BOOST_WITHOUT_FLAGS_COMMASEPERATED), --without-libraries=$(BOOST_WITHOUT_FLAGS_COMMASEPERATED)) @@ -70,11 +72,6 @@ endef define BOOST_INSTALL_TARGET_CMDS (cd $(@D) && ./b2 -q -d+2 \ --user-config=$(@D)/user-config.jam \ - toolset=gcc \ - variant=$(BOOST_VARIANT) \ - link=$(BOOST_LINK) \ - threading=$(BOOST_MULTI) \ - runtime-link=$(BOOST_LINK) \ $(BOOST_OPT) \ --prefix=$(TARGET_DIR)/usr \ --layout=system install ) @@ -83,12 +80,7 @@ endef define BOOST_INSTALL_STAGING_CMDS (cd $(@D) && ./bjam -d+2 \ --user-config=$(@D)/user-config.jam \ - toolset=gcc \ - variant=$(BOOST_VARIANT) \ - link=$(BOOST_LINK) \ - threading=$(BOOST_MULTI) \ $(BOOST_OPT) \ - runtime-link=$(BOOST_LINK) \ --prefix=$(STAGING_DIR)/usr \ --layout=system install) endef