[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - external/gpgmepp external/libassuan external/libgpg-error

[Thorsten Behrens]

 external/gpgmepp/ExternalProject_gpgmepp.mk           |    8 +++++---
 external/libassuan/ExternalProject_libassuan.mk       |   11 ++++++-----
 external/libgpg-error/ExternalProject_libgpg-error.mk |   12 +++++-------
 3 files changed, 16 insertions(+), 15 deletions(-)

New commits:
commit 29228e83df009cf76ac819ed024527be1092f065
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Mon Dec 4 00:12:10 2017 +0100

    gpg4libre: pass windows arch down to windres
    
    At least for cygwin64 windres, a wider number of cross-building
    targets are supported. Utilize that for getting suitable versionrc
    arch built, obviating the need to disable x86_64 on cyg32 and vice
    versa.
    
    Change-Id: I9770a3c1d6602a9747b5b3caa4961d66c471f4e4
    Reviewed-on: https://gerrit.libreoffice.org/45763
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 293df86b2ec38727f3b966b2c272ab4b05b227b7)
    Reviewed-on: https://gerrit.libreoffice.org/45767
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk b/external/gpgmepp/ExternalProject_gpgmepp.mk
index 7aaa42a12b40..806cd6817e3b 100644
--- a/external/gpgmepp/ExternalProject_gpgmepp.mk
+++ b/external/gpgmepp/ExternalProject_gpgmepp.mk
@@ -21,6 +21,8 @@ $(eval $(call gb_ExternalProject_use_externals,gpgmepp,\
 ))
 
 ifeq ($(COM),MSC)
+gb_ExternalProject_gpgmepp_host := $(if $(filter INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32)
+gb_ExternalProject_gpgmepp_target := $(if $(filter INTEL,$(CPUNAME)),pe-i386,pe-x86-64)
 $(call gb_ExternalProject_get_state_target,gpgmepp,build): $(call gb_Executable_get_target,cpp)
 	$(call gb_ExternalProject_run,build,\
 		autoreconf \
@@ -37,10 +39,10 @@ $(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=$(if $(filter INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) \
+		   --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)'\' \
 		   MAKE=$(MAKE) \
-		   RC='windres --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC) -I$(ATL_INCLUDE)'\' \
-	  && $(MAKE) \
+	    && $(MAKE) \
 	)
 else
 $(call gb_ExternalProject_get_state_target,gpgmepp,build):
diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk
index fdadb2851042..f477280c0172 100644
--- a/external/libassuan/ExternalProject_libassuan.mk
+++ b/external/libassuan/ExternalProject_libassuan.mk
@@ -20,22 +20,23 @@ $(eval $(call gb_ExternalProject_use_externals,libassuan,\
 ))
 
 ifeq ($(COM),MSC)
+gb_ExternalProject_libassuan_host := $(if $(filter INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32)
+gb_ExternalProject_libassuan_target := $(if $(filter INTEL,$(CPUNAME)),pe-i386,pe-x86-64)
 $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executable_get_target,cpp)
 	$(call gb_ExternalProject_run,build,\
-		autoreconf \
-		&& ./configure \
+	  autoreconf \
+	  && ./configure \
 		--enable-static \
 		--disable-shared \
 		$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 		CXXFLAGS="$(CXXFLAGS)" \
 		GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
 		GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
-		--host=$(if $(filter INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) \
+		--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)'\' \
 		MAKE=$(MAKE) \
-		RC='windres --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC) -I$(ATL_INCLUDE)'\' \
 	  && $(MAKE) \
 	)
-
 else
 $(call gb_ExternalProject_get_state_target,libassuan,build):
 	$(call gb_ExternalProject_run,build,\
diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk b/external/libgpg-error/ExternalProject_libgpg-error.mk
index ecb96f00b496..efd13f2c02e4 100644
--- a/external/libgpg-error/ExternalProject_libgpg-error.mk
+++ b/external/libgpg-error/ExternalProject_libgpg-error.mk
@@ -16,6 +16,8 @@ $(eval $(call gb_ExternalProject_register_targets,libgpg-error,\
 $(eval $(call gb_ExternalProject_use_autoconf,libgpg-error,build))
 
 ifeq ($(COM),MSC)
+gb_ExternalProject_libgpg-error_host := $(if $(filter INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32)
+gb_ExternalProject_libgpg-error_target := $(if $(filter INTEL,$(CPUNAME)),pe-i386,pe-x86-64)
 $(call gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_Executable_get_target,cpp)
 	$(call gb_ExternalProject_run,build,\
 		MAKE=$(MAKE) ./configure \
@@ -25,14 +27,10 @@ $(call gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_Execut
 			--disable-languages \
 			--disable-doc \
 			--disable-tests \
-			$(if $(filter LINUX,$(OS)), \
-				'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
-					-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \
-			--host=$(if $(filter INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) \
-			RC='windres --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC) -I$(ATL_INCLUDE)'\' \
-	  && $(MAKE) \
+			--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)'\' \
+	    && $(MAKE) \
 	)
-
 else
 $(call gb_ExternalProject_get_state_target,libgpg-error,build):
 	$(call gb_ExternalProject_run,build,\