mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-08-01 07:27:43 +00:00
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>
This commit is contained in:
parent
4b02c64a2f
commit
c94ff3cf35
@ -16,6 +16,40 @@ config BR2_PACKAGE_BOOST
|
|||||||
|
|
||||||
if 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
|
config BR2_PACKAGE_BOOST_CHRONO
|
||||||
bool "boost-chrono"
|
bool "boost-chrono"
|
||||||
|
|
||||||
|
@ -81,6 +81,7 @@ endif
|
|||||||
|
|
||||||
BOOST_WITHOUT_FLAGS_COMMASEPERATED += $(subst $(space),$(comma),$(strip $(BOOST_WITHOUT_FLAGS)))
|
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_FLAGS += $(if $(BOOST_WITHOUT_FLAGS_COMMASEPERATED), --without-libraries=$(BOOST_WITHOUT_FLAGS_COMMASEPERATED))
|
||||||
|
BOOST_LAYOUT = $(call qstrip, $(BR2_PACKAGE_BOOST_LAYOUT))
|
||||||
|
|
||||||
define BOOST_CONFIGURE_CMDS
|
define BOOST_CONFIGURE_CMDS
|
||||||
(cd $(@D) && ./bootstrap.sh $(BOOST_FLAGS))
|
(cd $(@D) && ./bootstrap.sh $(BOOST_FLAGS))
|
||||||
@ -99,7 +100,7 @@ define BOOST_INSTALL_TARGET_CMDS
|
|||||||
--user-config=$(@D)/user-config.jam \
|
--user-config=$(@D)/user-config.jam \
|
||||||
$(BOOST_OPT) \
|
$(BOOST_OPT) \
|
||||||
--prefix=$(TARGET_DIR)/usr \
|
--prefix=$(TARGET_DIR)/usr \
|
||||||
--layout=system install )
|
--layout=$(BOOST_LAYOUT) install )
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define HOST_BOOST_BUILD_CMDS
|
define HOST_BOOST_BUILD_CMDS
|
||||||
@ -114,7 +115,7 @@ define HOST_BOOST_INSTALL_CMDS
|
|||||||
--user-config=$(@D)/user-config.jam \
|
--user-config=$(@D)/user-config.jam \
|
||||||
$(HOST_BOOST_OPT) \
|
$(HOST_BOOST_OPT) \
|
||||||
--prefix=$(HOST_DIR)/usr \
|
--prefix=$(HOST_DIR)/usr \
|
||||||
--layout=system install )
|
--layout=$(BOOST_LAYOUT) install )
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define BOOST_INSTALL_STAGING_CMDS
|
define BOOST_INSTALL_STAGING_CMDS
|
||||||
@ -122,7 +123,7 @@ define BOOST_INSTALL_STAGING_CMDS
|
|||||||
--user-config=$(@D)/user-config.jam \
|
--user-config=$(@D)/user-config.jam \
|
||||||
$(BOOST_OPT) \
|
$(BOOST_OPT) \
|
||||||
--prefix=$(STAGING_DIR)/usr \
|
--prefix=$(STAGING_DIR)/usr \
|
||||||
--layout=system install)
|
--layout=$(BOOST_LAYOUT) install)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(eval $(generic-package))
|
$(eval $(generic-package))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user