diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-06-21 21:59:11 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-06-22 15:50:01 +0200 |
| commit | ab50f0b08b22af1e60a0b6ce5e7e8e7d1f665216 (patch) | |
| tree | 8c6567bda0948280c211dcbb7166d2535983f1df /RepositoryExternal.mk | |
| parent | c7782c7c27d85866872cc24a618df02504ff12ca (diff) | |
xmlsecurity: implement support for building against system-xmlsec
The only remaining difference is that in the system-xmlsec case we work
with the default key manager, not with the one that's only added by our
xmlsec patches.
This works for me for the uses I know of (see
<https://lists.freedesktop.org/archives/libreoffice/2017-February/076947.html>
for the motivation): signing and verifying of different signatures (bad
signature, good with non-trusted CA, good with trusted CA) with
software-based certificates all behave as expected.
Change-Id: If3f3e2b8373ab7397db3f98070a5a2ce51fa7c06
Reviewed-on: https://gerrit.libreoffice.org/39075
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index b821955f21d2..67c078345d4d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -921,6 +921,34 @@ endef endif # SYSTEM_LIBXSLT +ifneq ($(SYSTEM_XMLSEC),) + +define gb_LinkTarget__use_xmlsec +$(call gb_LinkTarget_add_defs,$(1),\ + -DSYSTEM_XMLSEC \ +) +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(XMLSEC_CFLAGS) \ +) +$(call gb_LinkTarget_add_libs,$(1),$(XMLSEC_LIBS)) + +endef + +gb_ExternalProject__use_xmlsec:= + +else # !SYSTEM_XMLSEC + +$(eval $(call gb_Helper_register_packages_for_install,ooo,\ + xmlsec \ +)) + +define gb_LinkTarget__use_xmlsec + +endef + +endif # SYSTEM_XMLSEC + ifneq ($(SYSTEM_LIBLANGTAG),) define gb_LinkTarget__use_liblangtag |