Skip to contentSkip to conversation

Added support for configuration of boost binary names layout

PATCH New Uwe Kindler 3 participants 3 messages Mar 15, 2014

lore
Share & tools
lore

Uwe Kindler

author
#0 lore raw

PATCH v4 1/1 Added support for configuration of boost binary names layout

Signed-off-by Uwe Kindler <[email protected]>
Acked-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

---
Changes v3 -> v4:
- moved config BR2_PACKAGE_BOOST_LAYOUT out of choice

Changes v2 -> v3:
- removed inconsistencies in Config.in help texts and fixed typos (suggested by Thomas De Schampheleire)

Changes v1 -> v2:
- handle "switch statement" in Config.in file via BR2_PACKAGE_BOOST_LAYOUT (suggested by Arnout Vandecappelle)

---
 package/boost/Config.in |   34 ++++++++++++++++++++++++++++++++++
 package/boost/boost.mk  |    7 ++++---
 2 files changed, 38 insertions(+), 3 deletions(-)
package/boost/Config.in +34 -0
index 68c3909..57dd5fc 100644
@@ -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"
package/boost/boost.mk +4 -3
index 7aab614..2ae8034 100644
@@ -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))
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v4 1/1 Added support for configuration of boost binary names layout

Uwe Kindler <[email protected]> schreef:

Quoted 11 lines
Signed-off-by Uwe Kindler <[email protected]>
Acked-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

---
Changes v3 -> v4:
- moved config BR2_PACKAGE_BOOST_LAYOUT out of choice

Changes v2 -> v3:
- removed inconsistencies in Config.in help texts and fixed typos (suggested by Thomas De Schampheleire)

Quoted 7 lines

Changes v1 -> v2:
- handle "switch statement" in Config.in file via BR2_PACKAGE_BOOST_LAYOUT (suggested by Arnout Vandecappelle)

---
package/boost/Config.in | 34 ++++++++++++++++++++++++++++++++++
package/boost/boost.mk | 7 ++++---

2 files changed, 38 insertions(+), 3 deletions(-)
Reviewed-by Thomas De Schampheleire <[email protected]>
#2 lore raw

PATCH v4 1/1 Added support for configuration of boost binary names layout

In reply to Uwe Kindler
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Uwe" == Uwe Kindler <[email protected]> writes:

Signed-off-by Uwe Kindler <[email protected]>
Acked-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

---
Changes v3 -> v4:
- moved config BR2_PACKAGE_BOOST_LAYOUT out of choice

Committed with trailing whitespace / too long lines fixed, thanks.

Signature · 1 line
Bye, Peter Korsgaard