diff options
| author | Uwe Kindler <uwe_kindler@web.de> | 2014-03-15 05:27:52 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-03-15 22:18:48 +0100 |
| commit | c94ff3cf353207de2864ccea869b95303ab66420 (patch) | |
| tree | 7bb9b203026db0ba017bcecad000cf8e0c9227ef /package | |
| parent | 4b02c64a2f07e3ae0215262eb8af0c0a6ca5e979 (diff) | |
| download | buildroot-c94ff3cf353207de2864ccea869b95303ab66420.tar.gz buildroot-c94ff3cf353207de2864ccea869b95303ab66420.zip | |
Added support for configuration of boost binary names layout
[Peter: fix trailing whitescape / too long lines]
Signed-off-by: Uwe Kindler <uwe_kindler@web.de>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package')
| -rw-r--r-- | package/boost/Config.in | 34 | ||||
| -rw-r--r-- | package/boost/boost.mk | 7 |
2 files changed, 38 insertions, 3 deletions
diff --git a/package/boost/Config.in b/package/boost/Config.in index 68c3909664..fa6806129e 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -16,6 +16,40 @@ 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 + Boost binary 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 + Boost binary names include the encoded build properties such + as variant and threading, but do not include 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 + Boost binary names include the Boost version number, name + and version of the compiler and encoded build properties. + +endchoice + +config BR2_PACKAGE_BOOST_LAYOUT + string + default "system" if BR2_PACKAGE_BOOST_LAYOUT_SYSTEM + default "tagged" if BR2_PACKAGE_BOOST_LAYOUT_TAGGED + default "versioned" if BR2_PACKAGE_BOOST_LAYOUT_VERSIONED + config BR2_PACKAGE_BOOST_CHRONO bool "boost-chrono" diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 7aab6145a4..2ae8034156 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -81,6 +81,7 @@ 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)) +BOOST_LAYOUT = $(call qstrip, $(BR2_PACKAGE_BOOST_LAYOUT)) define BOOST_CONFIGURE_CMDS (cd $(@D) && ./bootstrap.sh $(BOOST_FLAGS)) @@ -99,7 +100,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 +115,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 +123,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)) |
