diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2016-03-05 20:09:34 -0500 |
|---|---|---|
| committer | Kohei Yoshida <libreoffice@kohei.us> | 2016-03-08 04:43:24 +0000 |
| commit | b325b4c286b56a63316063a3ac4648bf7b7efcbe (patch) | |
| tree | 3084a96548350c38c0d910670c9c512c5ea6e30f /RepositoryExternal.mk | |
| parent | a420a4346ec21ea561f1321767d6a5eed98df02b (diff) | |
Update liborcus to 0.11.0.
Markus did half of this, and I simply carried the torch.
Change-Id: Icd3ee1e4b5bd562faee06dfd9dce52a4bed49a71
Reviewed-on: https://gerrit.libreoffice.org/22943
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5b497eeb35cd..c6fe3718a575 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -743,6 +743,21 @@ $(call gb_LinkTarget_set_include,$(1),\ endef +define gb_LinkTarget__use_boost_filesystem +$(call gb_LinkTarget_add_defs,$(1),\ + -DBOOST_ALL_NO_LIB \ +) + +$(call gb_LinkTarget_use_static_libraries,$(1),\ + boost_filesystem \ +) + +endef + +define gb_ExternalProject__use_boost_filesystem +$(call gb_ExternalProject_use_static_libraries,$(1),boost_filesystem) +endef + define gb_ExternalProject__use_boost_headers $(call gb_ExternalProject_use_unpacked,$(1),boost) @@ -3129,7 +3144,7 @@ $(call gb_LinkTarget_set_include,$(1),\ ) $(call gb_LinkTarget_add_libs,$(1),\ - -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.10 \ + -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.11 \ ) $(if $(SYSTEM_BOOST), \ @@ -3148,7 +3163,7 @@ $(call gb_LinkTarget_set_include,$(1),\ ) $(call gb_LinkTarget_add_libs,$(1),\ - -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.10 \ + -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.11 \ ) endef |