diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-05-22 19:50:22 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-05-24 12:40:46 +0300 |
| commit | 503b248127a92b9ad190e05f6a1d50574183cd47 (patch) | |
| tree | 57aacf978349057e170ff0fb4507455217b63b71 /RepositoryExternal.mk | |
| parent | Fix warning: unused variable 'aURL' [loplugin] (diff) | |
| download | core-503b248127a92b9ad190e05f6a1d50574183cd47.tar.gz core-503b248127a92b9ad190e05f6a1d50574183cd47.zip | |
Update bundled boost to 1.53.0
Modify our patches as necessary to match the updated boost sources. Drop
patches for which corresponding (or even identical) changes already are
present. Add a new boostsystem static library and use it in two places.
Change-Id: Ib59558feb56dab87a69c91b38caca8e7a9e9a22e
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 973ebc518f66..0be205470fea 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -556,6 +556,24 @@ $(call gb_LinkTarget_add_libs,$(1),\ endef +define gb_LinkTarget__use_boostsystem +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(BOOST_CPPFLAGS) \ +) + +$(call gb_LinkTarget_add_ldflags,$(1),\ + $(BOOST_LDFLAGS) \ +) + +$(call gb_LinkTarget_add_libs,$(1),\ + $(BOOST_SYSTEM_LIB) \ +) + +endef + +gb_ExternalProject__use_boostsystem := + define gb_LinkTarget__use_boost_headers $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ @@ -570,6 +588,7 @@ else # !SYSTEM_BOOST $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ boostdatetime \ + boostsystem \ )) ifeq ($(OS),WNT) @@ -600,6 +619,21 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ endef +define gb_LinkTarget__use_boostsystem +$(call gb_LinkTarget_add_defs,$(1),\ + -DBOOST_ALL_NO_LIB \ +) + +$(call gb_LinkTarget_use_static_libraries,$(1),\ + boostsystem \ +) + +endef + +define gb_ExternalProject__use_boostsystem +$(call gb_LinkTarget_use_static_libraries,$(1),boostsystem) +endef + define gb_LinkTarget__use_boost_headers $(call gb_LinkTarget_use_unpacked,$(1),boost) $(call gb_LinkTarget_set_include,$(1),\ |