Fix MinGW build - libxmlsec builds now.

This also removes patching of the generated 'configure' in libxmlsec; instead,
autoreconf is called.

Change-Id: I28c1cc38432d195dd0219fb5a0ab0ea1a35f7a32

Repository.mk

@@ -676,13 +676,16 @@ ifeq ($(OS),WNT)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
     xmlsec1 \
     xmlsec1-nss \
+))
+ifneq ($(CROSS_COMPILING),YES)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
     xmlsec1-mscrypto \
 ))
+endif
 else
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
     xmlsec1 \
     xmlsec1-nss \
-    xmlsec1-mscrypto \
 ))
 endif
 

configure.in

@@ -2788,6 +2788,7 @@ AC_SUBST(DISABLE_ATL)
 
 if test "$cross_compiling" = "yes"; then
     CROSS_COMPILING=YES
+    SCPDEFS="$SCPDEFS -DCROSS_COMPILING"
 else
     CROSS_COMPILING=
     BUILD_TYPE="$BUILD_TYPE NATIVE"
@@ -4840,6 +4841,10 @@ using namespace std;
             if test -n "$MINGW_GXXDLL"; then
                 mingw_gxxdll_root=${MINGW_GXXDLL%.dll}
                 mingw_gxxdll_root=${mingw_gxxdll_root#lib}
+                if test "$CROSS_COMPILING" = "YES" ; then
+                    dnl m4 escaping!
+                    mingw_gxxdll_root=${mingw_gxxdll_root%-[[0-9]]}
+                fi
                 MINGW_SHARED_LIBSTDCPP=-l$mingw_gxxdll_root
                 MINGW_SHARED_GXXLIB=YES
                 AC_MSG_RESULT([$MINGW_GXXDLL])

distro-configs/LibreOfficeMinGW.conf

@@ -27,5 +27,4 @@
 --disable-directx
 --disable-extension-integration
 --disable-mozilla
---disable-xmlsec
 --disable-postgresql-sdbc

libxmlsec/makefile.mk

@@ -97,13 +97,24 @@ xmlsec_LIBS=
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
 xmlsec_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 .ENDIF
+CONF_ILIB=
+.IF "$(ILIB)" != ""
+CONF_ILIB=-L$(ILIB:s/;/ -L/)
+.ENDIF
+
 CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure
+CONFIGURE_ACTION=autoreconf ; .$/configure
+
+.IF "$(CROSS_COMPILING)"=="YES"
+BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) MINGW_SYSROOT=$(MINGW_SYSROOT)
+.ELSE
+BUILD_AND_HOST=--build=i586-pc-mingw32 --host=i586-pc-mingw32 --with-mozilla_ver=1.7.5 --enable-mscrypto
+.ENDIF
 
 # Note that this is obsolete crack for building *locally* on Windows with MinGW,
 # something we don't see the point in here in LibreOffice
 
-CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --enable-mscrypto --disable-crypto-dl --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
+CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --disable-crypto-dl $(BUILD_AND_HOST) CC="$(xmlsec_CC)" LDFLAGS="-Wl,--no-undefined $(CONF_ILIB)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB="$(LIBXML2LIB)" ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
 
 .IF "$(SYSTEM_NSS)" != "YES"
 CONFIGURE_FLAGS+=--enable-pkgconfig=no
@@ -154,7 +165,7 @@ LDFLAGS:=$(xmlsec_LDFLAGS)
 
 .ENDIF
 CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
+CONFIGURE_ACTION=autoreconf ; .$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
 CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)"
 
 .IF "$(CROSS_COMPILING)"=="YES"
@@ -193,8 +204,12 @@ OUTDIR2INC=include$/xmlsec
 
 .IF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
-OUT2LIB+=src$/.libs$/libxmlsec1.dll.a src$/nss$/.libs$/libxmlsec1-nss.dll.a src$/mscrypto$/.libs$/libxmlsec1-mscrypto.dll.a
-OUT2BIN+=src$/.libs$/libxmlsec1.dll src$/nss$/.libs$/libxmlsec1-nss.dll src$/mscrypto$/.libs$/libxmlsec1-mscrypto.dll
+OUT2LIB+=src$/.libs$/libxmlsec1.dll.a src$/nss$/.libs$/libxmlsec1-nss.dll.a
+OUT2BIN+=src$/.libs$/libxmlsec1.dll src$/nss$/.libs$/libxmlsec1-nss.dll
+.IF "$(CROSS_COMPILING)" != "YES"
+OUT2LIB+=src$/mscrypto$/.libs$/libxmlsec1-mscrypto.dll.a
+OUT2BIN+=src$/mscrypto$/.libs$/libxmlsec1-mscrypto.dll
+.ENDIF
 .ELSE
 OUT2LIB+=win32$/binaries$/*.lib
 OUT2BIN+=win32$/binaries$/*.dll

libxmlsec/xmlsec1-configure-libxml-libxslt.patch

---- misc/xmlsec1-1.2.14/configure	Wed Jun 30 11:55:36 2010
-+++ misc/build/xmlsec1-1.2.14/configure	Wed Jun 30 11:57:28 2010
-@@ -12077,7 +12077,7 @@
-   ;;
-   *)
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--as_dummy="$with_libxml/bin:$PATH"
-+as_dummy="$with_libxml${with_libxml:+/bin:}$PATH"
- for as_dir in $as_dummy
- do
-   IFS=$as_save_IFS
-@@ -12258,7 +12258,7 @@
-   ;;
-   *)
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--as_dummy="$with_libxslt/bin:$PATH"
-+as_dummy="$with_libxslt${with_libxslt:+/bin:}$PATH"
- for as_dir in $as_dummy
- do
-   IFS=$as_save_IFS
 --- misc/xmlsec1-1.2.14/configure.in	Wed Jun 30 11:55:37 2010
 +++ misc/build/xmlsec1-1.2.14/configure.in	Wed Jun 30 11:53:55 2010
 @@ -231,7 +231,7 @@

libxmlsec/xmlsec1-mingw32.patch

---- misc/xmlsec1-1.2.14/configure	2009-09-29 15:55:33.269924586 +0200
-+++ misc/build/xmlsec1-1.2.14/configure	2009-09-29 15:55:08.838176411 +0200
-@@ -13184,7 +13184,9 @@
- 	done
- 
- 	for dir in $ac_nss_lib_dir ; do
--	    if test -f $dir/libnspr4.so -o -f $dir/libnspr4.dylib ; then
-+            case $host_os in
-+            cygwin* | mingw* | pw32*)
-+    	      if test -f $dir/libnspr4.$libext ; then
- 		        	if test "z$dir" = "z/usr/lib" ; then
-             	    NSPR_LIBS="$NSPR_LIBS_LIST"
-     		else
-@@ -13197,6 +13199,25 @@
- 		NSPR_LIBS_FOUND="yes"
- 		break
- 	    fi
-+              ;;
-+
-+            *)
-+
-+              if test -f $dir/libnspr4.so -o -f $dir/libnspr4.dylib ; then
-+		        	if test "z$dir" = "z/usr/lib" ; then
-+            	    NSPR_LIBS="$NSPR_LIBS_LIST"
-+    		else
-+    		    if test "z$with_gnu_ld" = "zyes" ; then
-+    			NSPR_LIBS="-Wl,-rpath-link -Wl,$dir -L$dir $NSPR_LIBS_LIST"
-+    		    else
-+    			NSPR_LIBS="-L$dir $NSPR_LIBS_LIST"
-+		    fi
-+		fi
-+		NSPR_LIBS_FOUND="yes"
-+		break
-+	    fi
-+              ;;
-+            esac
- 	done
-     fi
- 
-@@ -13266,6 +13287,24 @@
-         done
- 
-         for dir in $ac_nss_lib_dir ; do
-+            case $host_os in
-+            cygwin* | mingw* | pw32*)
-+    	      if test -f $dir/libnss3.$libext ; then
-+        	    		if test "z$dir" = "z/usr/lib" ; then
-+        	    NSS_LIBS="$NSS_LIBS_LIST"
-+                else
-+            	    if test "z$with_gnu_ld" = "zyes" ; then
-+    			NSS_LIBS="-Wl,-rpath-link -Wl,$dir -L$dir $NSS_LIBS_LIST"
-+            	    else
-+        		NSS_LIBS="-L$dir $NSS_LIBS_LIST"
-+		    fi
-+		fi
-+    		NSS_LIBS_FOUND="yes"
-+    		break
-+	    fi
-+              ;;
-+
-+            *)
-             if test -f $dir/libnss3.so -o -f $dir/libnss3.dylib ; then
-         	    		if test "z$dir" = "z/usr/lib" ; then
-         	    NSS_LIBS="$NSS_LIBS_LIST"
-@@ -13279,6 +13318,8 @@
-     		NSS_LIBS_FOUND="yes"
-     		break
- 	    fi
-+              ;;
-+            esac
- 	done
-     fi
- 
-@@ -13684,7 +13725,7 @@
- $as_echo "$MSCRYPTO_ENABLE" >&6; }
- else
-     LIBS_SAVE="$LIBS"
--    LIBS="$LIBS -lcrypt32"
-+    LIBS="$LIBS ${PSDK_HOME}/lib/crypt32.lib"
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mscrypto libraries" >&5
- $as_echo_n "checking for mscrypto libraries... " >&6; }
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -13711,13 +13752,7 @@
-     XMLSEC_NO_MSCRYPTO="0"
- 
-     MSCRYPTO_CFLAGS="$MSCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MSCRYPTO=1"
--    case $host in
--	*-*-mingw*)
--						MSCRYPTO_LIBS='-Wl,$(srcdir)/mingw-crypt32.def';;
--	*)
--		MSCRYPTO_LIBS="-lcrypt32";;
--    esac
--
-+    MSCRYPTO_LIBS="${PSDK_HOME}/lib/crypt32.lib"
-         if test "z$XMLSEC_CRYPTO" = "z" ; then
- 	XMLSEC_CRYPTO="mscrypto"
-     	XMLSEC_CRYPTO_LIB="$MSCRYPTO_CRYPTO_LIB"
 --- misc/xmlsec1-1.2.14/configure.in	2009-09-29 15:55:33.282288142 +0200
 +++ misc/build/xmlsec1-1.2.14/configure.in	2009-09-29 15:49:39.614223428 +0200
 @@ -671,7 +671,9 @@

scp2/source/ooo/file_library_ooo.scp

@@ -1521,6 +1521,18 @@ File gid_File_Lib_LibXMLSec_xmlseccore
     Styles = (PACKED);
 End
 
+#ifdef CROSS_COMPILING
+File gid_File_Lib_LibXMLSec_xmlsecnss
+    LIB_FILE_BODY;
+  #ifdef _gcc3
+    Name = "libxmlsec1-nss.dll";
+  #else
+    Name = "libxmlsec-nss.dll";
+  #endif
+    Dir = SCP2_OOO_BIN_DIR;
+    Styles = (PACKED);
+End
+#else
 File gid_File_Lib_LibXMLSec_xmlsecmscrypto
     LIB_FILE_BODY;
   #ifdef _gcc3
@@ -1532,6 +1544,7 @@ File gid_File_Lib_LibXMLSec_xmlsecmscrypto
     Styles = (PACKED);
 End
 #endif
+#endif
 
 File gid_File_Lib_Migrationoo2
     LIB_FILE_BODY;

xmlsecurity/Library_xsec_xmlsec.mk

@@ -89,7 +89,7 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
 	xmlsecurity/source/xmlsec/nss/xsec_nss \
 ))
 
-ifeq ($(GUI),WNT)
+ifeq ($(GUI)$(CROSS_COMPILING),WNT)
 
 $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
 	-DXMLSEC_CRYPTO_MSCRYPTO \
@@ -121,9 +121,15 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
 	-DXMLSEC_CRYPTO_NSS \
 ))
 
+ifeq ($(GUI)$(CROSS_COMPILING),WNTYES)
+$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
+	xmlsec1-nss \
+))
+else
 $(eval $(call gb_Library_use_static_libraries,xsec_xmlsec,\
 	xmlsec1-nss \
 ))
+endif
 
 $(eval $(call gb_Library_use_externals,xsec_xmlsec,\
 	plc4 \
@@ -140,7 +146,7 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
 	xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl \
 ))
 
-endif # ifeq ($(GUI),WNT)
+endif # ifeq ($(GUI)$(CROSS_COMPILING),WNT)
 
 ifeq ($(SYSTEM_NSS),YES)