diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-01-08 13:17:28 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-03-03 17:53:57 +0100 |
| commit | 36788e95fdbe96ac27c71197fdbfee178b53f52c (patch) | |
| tree | 31c45984896a72ee3c1aaaeca2a5ba0d1ad06104 /RepositoryExternal.mk | |
| parent | 0035b3218d8652652e62afe89eddfd28a9021b75 (diff) | |
upgrade liborcus
Conflicts:
external/boost/StaticLibrary_boost_system.mk
Change-Id: Ie4af26c87a100b67baeedbaa7fb1ac428845f92b
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 47 |
1 files changed, 39 insertions, 8 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 463db2bbe455..a0cd2b82ef42 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -615,7 +615,23 @@ $(call gb_LinkTarget_add_libs,$(1),\ endef -define gb_LinkTarget__use_boostsystem +define gb_LinkTarget__use_boost_iostreams +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(BOOST_CPPFLAGS) \ +) + +$(call gb_LinkTarget_add_ldflags,$(1),\ + $(BOOST_LDFLAGS) \ +) + +$(call gb_LinkTarget_add_libs,$(1),\ + $(BOOST_IOSTREAMS_LIB) \ +) + +endef + +define gb_LinkTarget__use_boost_system $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(BOOST_CPPFLAGS) \ @@ -631,7 +647,7 @@ $(call gb_LinkTarget_add_libs,$(1),\ endef -gb_ExternalProject__use_boostsystem := +gb_ExternalProject__use_boost_system := define gb_LinkTarget__use_boost_headers $(call gb_LinkTarget_set_include,$(1),\ @@ -668,19 +684,34 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ endef -define gb_LinkTarget__use_boostsystem +define gb_LinkTarget__use_boost_iostreams +$(call gb_LinkTarget_add_defs,$(1),\ + -DBOOST_ALL_NO_LIB \ +) + +$(call gb_LinkTarget_use_static_libraries,$(1),\ + boost_iostreams \ +) + +endef + +define gb_ExternalProject__use_boost_iostreams +$(call gb_ExternalProject_use_static_libraries,$(1),boost_iostreams) +endef + +define gb_LinkTarget__use_boost_system $(call gb_LinkTarget_add_defs,$(1),\ -DBOOST_ALL_NO_LIB \ ) $(call gb_LinkTarget_use_static_libraries,$(1),\ - boostsystem \ + boost_system \ ) endef -define gb_ExternalProject__use_boostsystem -$(call gb_ExternalProject_use_static_libraries,$(1),boostsystem) +define gb_ExternalProject__use_boost_system +$(call gb_ExternalProject_use_static_libraries,$(1),boost_system) endef define gb_LinkTarget__use_boost_headers @@ -2755,7 +2786,7 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs/liborcus-0.6$(gb_StaticLibrary_PLAINEXT) \ + $(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs/liborcus-0.8$(gb_StaticLibrary_PLAINEXT) \ ) $(if $(SYSTEM_BOOST), \ @@ -2772,7 +2803,7 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs/liborcus-parser-0.6$(gb_StaticLibrary_PLAINEXT) \ + $(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs/liborcus-parser-0.8$(gb_StaticLibrary_PLAINEXT) \ ) endef |