[Libreoffice-commits] core.git: external/gpgmepp external/libassuan

[Thorsten Behrens]

 external/gpgmepp/ExternalProject_gpgmepp.mk     |    4 ++--
 external/libassuan/ExternalProject_libassuan.mk |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit bade2dff0fc7c4d33af1fda8b3e79ff525c36565
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Mon Dec 11 12:44:19 2017 +0100

    external: fix host setup for gpgme and libassuan
    
    Change-Id: I9315a2158dce7d06a875787428e17eb75826de37
    Reviewed-on: https://gerrit.libreoffice.org/46222
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk b/external/gpgmepp/ExternalProject_gpgmepp.mk
index d144b78dcce7..3d6f0ac6e92b 100644
--- a/external/gpgmepp/ExternalProject_gpgmepp.mk
+++ b/external/gpgmepp/ExternalProject_gpgmepp.mk
@@ -39,8 +39,8 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build): $(call gb_Executable_
 					$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
 				$(if $(ENABLE_DEBUG),$(gb_DEBUG_CFLAGS)) \
 				$(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \
-		   --host=$(gb_ExternalProject_libgpg-error_host) \
-		   RC='windres -O COFF --target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \
+           --host=$(gb_ExternalProject_gpgmepp_host) \
+		   RC='windres -O COFF --target=$(gb_ExternalProject_gpgmepp_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \
 		   MAKE=$(MAKE) \
 	    && $(MAKE) \
 	)
diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk
index 988bd10c00e7..03570ff9e9ef 100644
--- a/external/libassuan/ExternalProject_libassuan.mk
+++ b/external/libassuan/ExternalProject_libassuan.mk
@@ -32,8 +32,8 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executabl
 		CXXFLAGS="$(CXXFLAGS)" \
 		GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
 		GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
-		--host=$(gb_ExternalProject_libgpg-error_host) \
-		RC='windres -O COFF --target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \
+        --host=$(gb_ExternalProject_libassuan_host) \
+		RC='windres -O COFF --target=$(gb_ExternalProject_libassuan_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \
 		MAKE=$(MAKE) \
 	  && $(MAKE) \
 	)