From patchwork Tue Mar 11 15:38:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uwe Kindler X-Patchwork-Id: 329137 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 9EFB02C00A4 for ; Wed, 12 Mar 2014 02:38:51 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D1A4B8AF63; Tue, 11 Mar 2014 15:38:49 +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 tWSzRUOI03cf; Tue, 11 Mar 2014 15:38:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 90F078B761; Tue, 11 Mar 2014 15:38:37 +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 7EC4B1C2438 for ; Tue, 11 Mar 2014 15:38:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 79C238B742 for ; Tue, 11 Mar 2014 15:38:36 +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 nb37MgPjdFFQ for ; Tue, 11 Mar 2014 15:38:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.web.de (mout.web.de [212.227.15.3]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0A3708B631 for ; Tue, 11 Mar 2014 15:38:35 +0000 (UTC) Received: from [192.168.101.21] ([109.73.24.114]) by smtp.web.de (mrweb002) with ESMTPSA (Nemesis) id 0MRD0p-1Wjh5z2kRz-00UZb9 for ; Tue, 11 Mar 2014 16:38:32 +0100 Message-ID: <531F2DF8.3080502@web.de> Date: Tue, 11 Mar 2014 16:38:32 +0100 From: Uwe Kindler User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: buildroot@buildroot.org X-Provags-ID: V03:K0:ykDsHWJycchCTmpYPTT+EoeGn95OgDbDZDoQUrSnlaQO9L/hjTd knAz6WLN23QuK2FEMoud7IlUDUsOOLl8H4EI97CS+3DgFgRGxfW3LEe6IwoLXPk6s0kGTji Ir61bo09Im4wCzqZh4638YTAlB/3salQeTi/gt8NtT4kP1fRaSvHeQTS3P1gPxN7YHPdTmE aMeWslL14ryiR0iTyH5Eg== Subject: [Buildroot] [PATCH] boost binary names layout configuration 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 Hi, the following patch adds support for configuration of boost binary names layout. We have a cross platform library that uses boost. On Windows it is not possible to build boost with system layout and we have to use tagged layout. Also for Ubuntu we use tagged layout and therefore it would be great to have the option to use tagged layout for buildroot. package/boost/Config.in | 28 ++++++++++++++++++++++++++++ package/boost/boost.mk | 14 +++++++++++--- 2 files changed, 39 insertions(+), 3 deletions(-) echo "using gcc : $(TARGET_CC_VERSION) : $(TARGET_CXX) : \"$(TARGET_CXXFLAGS)\" \"$(TARGET_LDFLAGS)\" ;" > $(@D)/user-config.jam @@ -99,7 +107,7 @@ define BOOST_INSTALL_TARGET_CMDS --user-config=$(@D)/user-config.jam \ $(BOOST_OPT) \ --prefix=$(TARGET_DIR)/usr \ - --layout=system install ) + --layout=$(BOOST_LAYOUT) install ) endef define HOST_BOOST_BUILD_CMDS @@ -114,7 +122,7 @@ define HOST_BOOST_INSTALL_CMDS --user-config=$(@D)/user-config.jam \ $(HOST_BOOST_OPT) \ --prefix=$(HOST_DIR)/usr \ - --layout=system install ) + --layout=$(BOOST_LAYOUT) install ) endef define BOOST_INSTALL_STAGING_CMDS @@ -122,7 +130,7 @@ define BOOST_INSTALL_STAGING_CMDS --user-config=$(@D)/user-config.jam \ $(BOOST_OPT) \ --prefix=$(STAGING_DIR)/usr \ - --layout=system install) + --layout=$(BOOST_LAYOUT) install) endef $(eval $(generic-package)) Acked-by: Arnout Vandecappelle (Essensium/Mind) diff --git a/package/boost/Config.in b/package/boost/Config.in index 68c3909..3ccb659 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -16,6 +16,34 @@ config BR2_PACKAGE_BOOST if BR2_PACKAGE_BOOST +choice + prompt "Layout" + default BR2_PACKAGE_BOOST_LAYOUT_SYSTEM + help + Selects the layout of boost binary names + +config BR2_PACKAGE_BOOST_LAYOUT_SYSTEM + bool "system" + help + Binaries names do not include the Boost version number or the name and + version number of the compiler. + +config BR2_PACKAGE_BOOST_LAYOUT_TAGGED + bool "tagged" + help + Names of boost binaries include the encoded build properties such as + variant and threading, but do not including compiler name and version, or + Boost version. This option is useful if you build several variants of + Boost, using the same compiler. + +config BR2_PACKAGE_BOOST_LAYOUT_VERSIONED + bool "versioned" + help + Names of boost binaries include the Boost version number, name and + version of the compiler and encoded build properties. + +endchoice + config BR2_PACKAGE_BOOST_CHRONO bool "boost-chrono" diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 7aab614..05e7cf6 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -82,6 +82,14 @@ endif BOOST_WITHOUT_FLAGS_COMMASEPERATED += $(subst $(space),$(comma),$(strip $(BOOST_WITHOUT_FLAGS))) BOOST_FLAGS += $(if $(BOOST_WITHOUT_FLAGS_COMMASEPERATED), --without-libraries=$(BOOST_WITHOUT_FLAGS_COMMASEPERATED)) +ifeq ($(BR2_PACKAGE_BOOST_LAYOUT_SYSTEM),y) +BOOST_LAYOUT = system +else ifeq ($(BR2_PACKAGE_BOOST_LAYOUT_TAGGED),y) +BOOST_LAYOUT = tagged +else +BOOST_LAYOUT = versioned +endif + define BOOST_CONFIGURE_CMDS (cd $(@D) && ./bootstrap.sh $(BOOST_FLAGS))