jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-01 15:37:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

boost: cleanup

Browse Source 
Move common staging/target bjam arguments into BOOST_OPT.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2012-04-16 22:01:17 +02:00
parent 8b354dac5a
commit 581af082c5
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
package/boost/boost.mk
View File

@ -45,6 +45,12 @@ else
BOOST_FLAGS += --without-icu BOOST_FLAGS += --without-icu
endif 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_PACKAGE_BOOST_LOCALE),y)
ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),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 # posix backend needs monetary.h which isn't available on uClibc
@ -54,10 +60,6 @@ endif
BOOST_DEPENDENCIES += $(if $(BR2_ENABLE_LOCALE),,libiconv) BOOST_DEPENDENCIES += $(if $(BR2_ENABLE_LOCALE),,libiconv)
endif 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_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))
@ -70,11 +72,6 @@ endef
define BOOST_INSTALL_TARGET_CMDS define BOOST_INSTALL_TARGET_CMDS
(cd $(@D) && ./b2 -q -d+2 \ (cd $(@D) && ./b2 -q -d+2 \
--user-config=$(@D)/user-config.jam \ --user-config=$(@D)/user-config.jam \
toolset=gcc \
variant=$(BOOST_VARIANT) \
link=$(BOOST_LINK) \
threading=$(BOOST_MULTI) \
runtime-link=$(BOOST_LINK) \
$(BOOST_OPT) \ $(BOOST_OPT) \
--prefix=$(TARGET_DIR)/usr \ --prefix=$(TARGET_DIR)/usr \
--layout=system install ) --layout=system install )
@ -83,12 +80,7 @@ endef
define BOOST_INSTALL_STAGING_CMDS define BOOST_INSTALL_STAGING_CMDS
(cd $(@D) && ./bjam -d+2 \ (cd $(@D) && ./bjam -d+2 \
--user-config=$(@D)/user-config.jam \ --user-config=$(@D)/user-config.jam \
toolset=gcc \
variant=$(BOOST_VARIANT) \
link=$(BOOST_LINK) \
threading=$(BOOST_MULTI) \
$(BOOST_OPT) \ $(BOOST_OPT) \
runtime-link=$(BOOST_LINK) \
--prefix=$(STAGING_DIR)/usr \ --prefix=$(STAGING_DIR)/usr \
--layout=system install) --layout=system install)
endef endef