[Libreoffice-commits] core.git: external/gpgme external/libassuan RepositoryExternal.mk

[Thorsten Behrens]

 RepositoryExternal.mk                           |   17 +++++++++++++++++
 external/gpgme/ExternalProject_gpgme.mk         |    7 +++++--
 external/libassuan/ExternalProject_libassuan.mk |    4 ++++
 3 files changed, 26 insertions(+), 2 deletions(-)

New commits:
commit dc003d59ea81d39bccc88f47b0a0d6c12f82357d
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Fri Feb 17 09:32:05 2017 +0100

    gpg4libre: fix gpgme build dependencies
    
    Change-Id: If71b144f008e35ee248421d922ab2a1a4463d093
    Reviewed-on: https://gerrit.libreoffice.org/34361
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d1b2416..0d387f2 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3393,6 +3393,10 @@ endif # ENABLE_BREAKPAD
 
 ifneq ($(SYSTEM_GPGME),)
 
+gb_ExternalProject__use_gpgme:=
+gb_ExternalProject__use_libassuan:=
+gb_ExternalProject__use_libgpg-error:=
+
 define gb_LinkTarget__use_gpgme
 $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
@@ -3407,6 +3411,19 @@ endef
 
 else # NON-SYSTEM_GPGME
 
+define gb_ExternalProject__use_gpgme
+$(call gb_ExternalProject_use_external_project,$(1),gpgme)
+
+endef
+define gb_ExternalProject__use_libassuan
+$(call gb_ExternalProject_use_external_project,$(1),libassuan)
+
+endef
+define gb_ExternalProject__use_libgpg-error
+$(call gb_ExternalProject_use_external_project,$(1),libgpg-error)
+
+endef
+
 define gb_LinkTarget__use_gpgme
 $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \
diff --git a/external/gpgme/ExternalProject_gpgme.mk b/external/gpgme/ExternalProject_gpgme.mk
index 5c32969..bc6429b 100644
--- a/external/gpgme/ExternalProject_gpgme.mk
+++ b/external/gpgme/ExternalProject_gpgme.mk
@@ -9,14 +9,17 @@
 
 $(eval $(call gb_ExternalProject_ExternalProject,gpgme))
 
-$(eval $(call gb_ExternalProject_use_external_project,gpgme,libassuan))
-
 $(eval $(call gb_ExternalProject_register_targets,gpgme,\
 	build \
 ))
 
 $(eval $(call gb_ExternalProject_use_autoconf,gpgme,build))
 
+$(eval $(call gb_ExternalProject_use_externals,gpgme,\
+       libgpg-error \
+       libassuan \
+))
+
 $(call gb_ExternalProject_get_state_target,gpgme,build):
 	$(call gb_ExternalProject_run,build,\
 		autoreconf \
diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk
index cbd0aaf..af1ffe9 100644
--- a/external/libassuan/ExternalProject_libassuan.mk
+++ b/external/libassuan/ExternalProject_libassuan.mk
@@ -15,6 +15,10 @@ $(eval $(call gb_ExternalProject_register_targets,libassuan,\
 
 $(eval $(call gb_ExternalProject_use_autoconf,libassuan,build))
 
+$(eval $(call gb_ExternalProject_use_externals,libassuan,\
+       libgpg-error \
+))
+
 $(call gb_ExternalProject_get_state_target,libassuan,build):
 	$(call gb_ExternalProject_run,build,\
 		autoreconf \