[Libreoffice-commits] .: libxmlsec/makefile.mk libxmlsec/xmlsec1-vc10.patch

[Fridrich Strba]

 libxmlsec/makefile.mk        |    7 ++++---
 libxmlsec/xmlsec1-vc10.patch |   15 +++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

New commits:
commit 10ea0f81ebcb27ff7de7b7d57db1cc174b9611ec
Author: Jesús Corrius <jesus at softcatala.org>
Date:   Wed Oct 20 01:15:54 2010 +0200

    Build fixes for VC++ 10

diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index b7dff3e..ffa92f5 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -55,7 +55,8 @@ TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f
 #xmlsec1-nssmangleciphers.patch: Dubious, do we still need this ?
 #xmlsec1-noverify.patch: As per readme.txt. 
 #xmlsec1-mingw32.patch: Mingw32 support. 
-#xmlsec1-mingw-customkeymanage-addmscrypto.patch builds the custom keymanager on mingw
+#xmlsec1-mingw-customkeymanage-addmscrypto.patch: builds the custom keymanager on mingw
+#xmlsec1-vc.path: support for Visual C++ 10
 PATCH_FILES=\
    xmlsec1-configure.patch \
    xmlsec1-configure-libxml-libxslt.patch \
@@ -65,8 +66,8 @@ PATCH_FILES=\
    xmlsec1-nssmangleciphers.patch \
    xmlsec1-noverify.patch \
    xmlsec1-mingw32.patch \
-   xmlsec1-mingw-keymgr-mscrypto.patch
-
+   xmlsec1-mingw-keymgr-mscrypto.patch \
+   xmlsec1-vc10.patch
 
 ADDITIONAL_FILES= \
     include$/xmlsec$/mscrypto$/akmngr.h \
diff --git a/libxmlsec/xmlsec1-vc10.patch b/libxmlsec/xmlsec1-vc10.patch
new file mode 100644
index 0000000..72a1d21
--- /dev/null
+++ b/libxmlsec/xmlsec1-vc10.patch
@@ -0,0 +1,15 @@
+--- misc/build/xmlsec1-1.2.14/win32/Makefile.msvc.old	2010-10-20 00:49:04.671875000 +0200
++++ misc/build/xmlsec1-1.2.14/win32/Makefile.msvc	2010-10-20 00:49:23.406250000 +0200
+@@ -351,7 +351,11 @@
+ !if "$(DEBUG)" == "1"
+ LDFLAGS 		= $(LDFLAGS) /DEBUG
+ !else
+-LDFLAGS 		= $(LDFLAGS) /OPT:NOWIN98
++!if "$(_NMAKE_VER)" >= "10.00.30319.01"
++LDFLAGS = $(LDFLAGS)
++!else
++LDFLAGS = $(LDFLAGS) /OPT:NOWIN98
++!endif
+ !endif
+ 
+ SOLIBS 			= $(LIBS) libxml2.lib