diff options
| author | David Tardon <dtardon@redhat.com> | 2015-06-04 16:09:48 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-06 12:21:59 +0200 |
| commit | a2c87fd37fe05c0888e7bd448470fadf59a5b034 (patch) | |
| tree | 1872c85af73e9a87c376ade139b9509e0465f42d /RepositoryExternal.mk | |
| parent | 875dbee844970784b977ecca1d501776cb4c51e9 (diff) | |
update to liborcus 0.9.1
Includes switching to dynamic libs.
Change-Id: I959c4e9430f8cf95f50d48e1b01d8323dba4af81
(cherry picked from commit edb38d702dd5a058ae0702b73a43328318b94649)
Signed-off-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 55 |
1 files changed, 49 insertions, 6 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 47e4d179aa68..726ef752250e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3209,35 +3209,78 @@ endef else # !SYSTEM_LIBORCUS +ifeq ($(COM),MSC) + +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\ + orcus \ + orcus-parser \ +)) + +define gb_LinkTarget__use_orcus +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,liborcus/include) \ + $$(INCLUDE) \ +) + +$(call gb_LinkTarget_use_libraries,$(1),\ + orcus \ +) + +endef + +define gb_LinkTarget__use_orcus-parser +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,liborcus/include) \ + $$(INCLUDE) \ +) + +$(call gb_LinkTarget_use_libraries,$(1),\ + orcus-parser \ +) + +endef + +else # !MSC + +$(eval $(call gb_Helper_register_packages_for_install,ooo,\ + liborcus \ +)) + define gb_LinkTarget__use_orcus -$(call gb_LinkTarget_use_external_project,$(1),liborcus) +$(call gb_LinkTarget_use_package,$(1),liborcus) + $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,liborcus/include) \ $$(INCLUDE) \ ) + $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs/liborcus-0.8$(gb_StaticLibrary_PLAINEXT) \ + -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.10 \ ) $(if $(SYSTEM_BOOST), \ - $(call gb_LinkTarget_add_ldflags,$(1),$(BOOST_LDFLAGS)) \ - $(call gb_LinkTarget_add_libs,$(1),$(BOOST_SYSTEM_LIB)) \ + $(call gb_LinkTarget_add_ldflags,$(1),$(BOOST_LDFLAGS)) \ + $(call gb_LinkTarget_add_libs,$(1),$(BOOST_SYSTEM_LIB)) \ ) endef define gb_LinkTarget__use_orcus-parser -$(call gb_LinkTarget_use_external_project,$(1),liborcus) +$(call gb_LinkTarget_use_package,$(1),liborcus) + $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,liborcus/include) \ $$(INCLUDE) \ ) + $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs/liborcus-parser-0.8$(gb_StaticLibrary_PLAINEXT) \ + -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.10 \ ) endef +endif # MSC + endif # SYSTEM_LIBORCUS else # ENABLE_ORCUS != TRUE |