[libxml2] Switch build to CMake for better triplet support. Add liblzma dependency.

1 files changed, 0 insertions, 60 deletions

diff --git a/ports/libxml2/0001-Fix-makefile.patch b/ports/libxml2/0001-Fix-makefile.patch
deleted file mode 100644
index 0e6c774dd..000000000
--- a/ports/libxml2/0001-Fix-makefile.patch
+++ /dev/null
@@ -1,60 +0,0 @@
----
- win32/Makefile.msvc | 22 ++++++++++++----------
- 1 file changed, 12 insertions(+), 10 deletions(-)
-
-diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
-index d16c1a2..de9e22e 100644
---- a/win32/Makefile.msvc
-+++ b/win32/Makefile.msvc
-@@ -28,11 +28,11 @@ XML_A = $(XML_BASENAME)_a.lib
- XML_A_DLL = $(XML_BASENAME)_a_dll.lib
- 
- # Place where we let the compiler put its output.
--BINDIR = bin.msvc
--XML_INTDIR = int.msvc
--XML_INTDIR_A = int.a.msvc
--XML_INTDIR_A_DLL = int.a.dll.msvc
--UTILS_INTDIR = int.utils.msvc
-+BINDIR = $(OUTDIR)\bin.msvc
-+XML_INTDIR = $(OUTDIR)\int.msvc
-+XML_INTDIR_A = $(OUTDIR)\int.a.msvc
-+XML_INTDIR_A_DLL = $(OUTDIR)\int.a.dll.msvc
-+UTILS_INTDIR = $(OUTDIR)\int.utils.msvc
- 
- # The preprocessor and its options.
- CPP = cl.exe /EP
-@@ -72,16 +72,18 @@ LIBS =
- LIBS = $(LIBS) wsock32.lib ws2_32.lib
- !endif 
- !if "$(WITH_ICONV)" == "1"
--LIBS = $(LIBS) iconv.lib
-+LIBS = $(LIBS) libiconv.lib libcharset.lib
- !endif 
- !if "$(WITH_ICU)" == "1"
- LIBS = $(LIBS) icu.lib
- !endif
- !if "$(WITH_ZLIB)" == "1"
--# could be named differently zdll or zlib
--# LIBS = $(LIBS) zdll.lib
-+!if "$(DEBUG)" == "1"
-+LIBS = $(LIBS) zlibd.lib
-+!else
- LIBS = $(LIBS) zlib.lib
- !endif
-+!endif
- !if "$(WITH_LZMA)" == "1"
- LIBS = $(LIBS) liblzma.lib
- !endif
-@@ -101,10 +103,10 @@ ARFLAGS = /nologo
- CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7
- LDFLAGS = $(LDFLAGS) /DEBUG
- !else
- CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 
- # commented out as this break VC10 c.f. 634846
- # LDFLAGS = $(LDFLAGS) /OPT:NOWIN98
--LDFLAGS = $(LDFLAGS)
-+LDFLAGS = $(LDFLAGS) /DEBUG /OPT:REF /OPT:ICF
- !endif
- 
- # Libxml object files.
---