mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move conditional stuff to RepositoryExternal.mk

Browse Source 
Change-Id: I33e299277c53e8e2b8ab7e4cdf52d2487f90b51b
Reviewed-on: https://gerrit.libreoffice.org/45211
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
David Tardon
2017-11-24 10:44:42 +01:00
parent e2277ac677
commit 7c77ff5dd2
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
RepositoryExternal.mk
View File

@@ -3451,6 +3451,8 @@ endef
endif # ENABLE_BREAKPAD endif # ENABLE_BREAKPAD
ifeq ($(ENABLE_GPGMEPP),TRUE)
ifneq ($(SYSTEM_GPGMEPP),) ifneq ($(SYSTEM_GPGMEPP),)
gb_ExternalProject__use_gpgmepp:= gb_ExternalProject__use_gpgmepp:=
@@ -3567,6 +3569,18 @@ endif
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 define gb_LinkTarget__use_dconf
$(call gb_LinkTarget_add_defs,$(1),$(DCONF_CFLAGS)) $(call gb_LinkTarget_add_defs,$(1),$(DCONF_CFLAGS))
$(call gb_LinkTarget_add_libs,$(1),$(DCONF_LIBS)) $(call gb_LinkTarget_add_libs,$(1),$(DCONF_LIBS))

6
xmlsecurity/Library_xsec_xmlsec.mk
View File

@@ -55,14 +55,10 @@ endif
$(eval $(call gb_Library_use_externals,xsec_xmlsec,\ $(eval $(call gb_Library_use_externals,xsec_xmlsec,\
boost_headers \ boost_headers \
gpgmepp \
libxml2 \ libxml2 \
xmlsec \ xmlsec \
)) ))
ifeq ($(ENABLE_GPGMEPP),TRUE)
$(eval $(call gb_Library_use_externals,xsec_xmlsec,\
gpgmepp \
))
endif
$(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
xmlsecurity/source/xmlsec/biginteger \ xmlsecurity/source/xmlsec/biginteger \