diff options
| author | David Tardon <dtardon@redhat.com> | 2017-11-24 10:44:42 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2017-11-30 12:36:32 +0100 |
| commit | 50fa8e10e44080f8b29b4e6ff9aab5e85a8942fe (patch) | |
| tree | b05ea707a19596df8dfa46b7929dbd15ce7040b8 | |
| parent | b784de0b99cff92ac34d33a257e225d11d101ec5 (diff) | |
move conditional stuff to RepositoryExternal.mk
Change-Id: I33e299277c53e8e2b8ab7e4cdf52d2487f90b51b
Reviewed-on: https://gerrit.libreoffice.org/45211
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit 7c77ff5dd2d0573a56f8b59dc9113c23e0ea29c9)
Signed-off-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | RepositoryExternal.mk | 14 | ||||
| -rw-r--r-- | xmlsecurity/Library_xsec_xmlsec.mk | 6 |
2 files changed, 15 insertions, 5 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index bb3c9b6895e0..bdc5d65a2d81 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3451,6 +3451,8 @@ endef endif # ENABLE_BREAKPAD +ifeq ($(ENABLE_GPGMEPP),TRUE) + ifneq ($(SYSTEM_GPGMEPP),) gb_ExternalProject__use_gpgmepp:= @@ -3567,6 +3569,18 @@ endif endif +else # !ENABLE_GPGMEPP + +gb_ExternalProject__use_gpgmepp := +gb_ExternalProject__use_libassuan := +gb_ExternalProject__use_libgpg-error := + +gb_LinkTarget__use_gpgmepp := +gb_LinkTarget__use_libassuan := +gb_LinkTarget__use_libgpg-error := + +endif # ENABLE_GPGMEPP + define gb_LinkTarget__use_dconf $(call gb_LinkTarget_add_defs,$(1),$(DCONF_CFLAGS)) $(call gb_LinkTarget_add_libs,$(1),$(DCONF_LIBS)) diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index ee2f9da7bb1b..1ef27dbc6602 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -55,14 +55,10 @@ endif $(eval $(call gb_Library_use_externals,xsec_xmlsec,\ boost_headers \ + gpgmepp \ libxml2 \ xmlsec \ )) -ifeq ($(ENABLE_GPGMEPP),TRUE) -$(eval $(call gb_Library_use_externals,xsec_xmlsec,\ - gpgmepp \ -)) -endif $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ xmlsecurity/source/xmlsec/biginteger \ |