summaryrefslogtreecommitdiff
path: root/libxmlsec
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-04-14 13:52:56 +0200
committerMichael Stahl <mstahl@redhat.com>2013-04-15 15:26:32 +0200
commit4811c2dc9f94929b60e7e2e0077871aad14fdc3a (patch)
tree8754348c8dbdf9c4fb91e0d70346f96ee7455999 /libxmlsec
parent3b65852f37f1c8daf8c5c0af1d810c68cc71d8e3 (diff)
adapt all externals to build against MSVC debug runtime
Add patches and/or tweaks to the following modules: curl, cppunit, icu, lcms2, libxml2, libxslt, libxmlsec, lpsolve, nss, openssl, python3 lcms2 has an inconsistency where the .lib and the .dll don't agree on the .dll name. openssl gets a honorable mention because apparently it's undocumented custom build system can build with /MDd if one picks the right configuration but i couldn't figure out how to do that in an hour of trying, and just patched the release config instead. Change-Id: I7854a0fc85247e398d561b4f513d09fe2d1ebb3c
Diffstat (limited to 'libxmlsec')
-rw-r--r--libxmlsec/xmlsec1-vc.patch5
1 files changed, 4 insertions, 1 deletions
diff --git a/libxmlsec/xmlsec1-vc.patch b/libxmlsec/xmlsec1-vc.patch
index 7cd8c4f2d00b..f996b8b55aa0 100644
--- a/libxmlsec/xmlsec1-vc.patch
+++ b/libxmlsec/xmlsec1-vc.patch
@@ -15,11 +15,14 @@
SOLIBS = $(LIBS) libxml2.lib
--- build/xmlsec/win32/Makefile.msvc.old 2012-11-30 11:09:23.130479800 -0500
+++ build/xmlsec/win32/Makefile.msvc 2012-11-30 11:11:06.037550700 -0500
-@@ -301,6 +301,7 @@
+@@ -301,6 +301,10 @@
CFLAGS = $(CFLAGS) /D "HAVE_STDIO_H" /D "HAVE_STDLIB_H"
CFLAGS = $(CFLAGS) /D "HAVE_STRING_H" /D "HAVE_CTYPE_H"
CFLAGS = $(CFLAGS) /D "HAVE_MALLOC_H" /D "HAVE_MEMORY_H"
+CFLAGS = $(CFLAGS) $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include
++!if "$(MSVC_USE_DEBUG_RUNTIME)" != ""
++CFLAGS = $(CFLAGS) /MDd
++!endif
# Optimisation and debug symbols.
!if "$(DEBUG)" == "1"