1diff -ur misc/libxml2-2.9.10/include/libxml/xmlversion.h misc/build/libxml2-2.9.10/include/libxml/xmlversion.h
2--- misc/libxml2-2.9.10/include/libxml/xmlversion.h	2018-03-05 07:54:29.000000000 -0800
3+++ misc/build/libxml2-2.9.10/include/libxml/xmlversion.h	2018-08-22 22:53:15.488158000 -0700
4@@ -270,7 +270,7 @@
5  *
6  * Whether iconv support is available
7  */
8-#if 1
9+#if 0
10 #define LIBXML_ICONV_ENABLED
11 #endif
12
13@@ -297,7 +297,7 @@
14  *
15  * Whether Debugging module is configured in
16  */
17-#if 1
18+#if 0
19 #define LIBXML_DEBUG_ENABLED
20 #endif
21
22diff -ur misc/libxml2-2.9.10/xml2-config.in misc/build/libxml2-2.9.10/xml2-config.in
23--- misc/libxml2-2.9.10/xml2-config.in	2016-06-07 03:04:14.000000000 -0700
24+++ misc/build/libxml2-2.9.10/xml2-config.in	2019-11-07 22:50:00.185459398 -0800
25@@ -1,9 +1,14 @@
26 #! /bin/sh
27
28-prefix=@prefix@
29-exec_prefix=@exec_prefix@
30-includedir=@includedir@
31-libdir=@libdir@
32+#prefix=@prefix@
33+#exec_prefix=@exec_prefix@
34+#includedir=@includedir@
35+#libdir=@libdir@
36+
37+prefix=${SOLARVERSION}/${INPATH}
38+exec_prefix=${SOLARVERSION}/${INPATH}
39+includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
40+libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
41
42 usage()
43 {
44@@ -65,7 +70,8 @@
45 	;;
46
47     --cflags)
48-        cflags="@XML_INCLUDEDIR@ @XML_CFLAGS@"
49+        cflags="-I${includedir}"
50+#        cflags="@XML_INCLUDEDIR@ @XML_CFLAGS@"
51        	;;
52
53     --libtool-libs)
54@@ -80,18 +86,19 @@
55        	;;
56
57     --libs)
58-        if [ "$2" = "--dynamic" ]; then
59-            shift
60-            libs="@XML_LIBS@"
61-        else
62-            libs="@XML_LIBS@ @XML_PRIVATE_LIBS@ @MODULE_PLATFORM_LIBS@"
63-        fi
64-
65-        if [ "@XML_LIBDIR@" != "-L/usr/lib" -a "@XML_LIBDIR@" != "-L/usr/lib64" ]; then
66-            libs="@XML_LIBDIR@ $libs"
67-        fi
68-
69-        libs="$libs @WIN32_EXTRA_LIBADD@"
70+        libs="-L${libdir} ${LIBXML2LIB} -lm"
71+        if [ "$2" = "--dynamic" ]; then
72+            shift
73+#            libs="@XML_LIBS@"
74+#        else
75+#            libs="@XML_LIBS@ @XML_PRIVATE_LIBS@ @MODULE_PLATFORM_LIBS@"
76+        fi
77+#
78+#        if [ "@XML_LIBDIR@" != "-L/usr/lib" -a "@XML_LIBDIR@" != "-L/usr/lib64" ]; then
79+#            libs="@XML_LIBDIR@ $libs"
80+#        fi
81+#
82+#        libs="$libs @WIN32_EXTRA_LIBADD@"
83         ;;
84
85     *)
86