libxml2-configure.patch (887c5134) | libxml2-configure.patch (2d019523) |
---|---|
1--- misc/libxml2-2.7.8/ltmain.sh 2009-10-06 17:39:54.000000000 +0100 2+++ misc/build/libxml2-2.7.8/ltmain.sh 2009-12-17 11:43:56.000000000 +0000 3@@ -6599,8 +6599,8 @@ 4 ;; 5 6 freebsd-elf) 7- major=".$current" 8- versuffix=".$current" 9+ major=.`expr $current - $age` 10+ versuffix=".$major.$age.$revision"; 11 ;; 12 13 irix | nonstopux) 14--- misc/libxml2-2.7.8/include/libxml/xmlversion.h 2009-12-17 11:45:19.000000000 +0000 15+++ misc/build/libxml2-2.7.8/include/libxml/xmlversion.h 2009-12-17 11:45:36.000000000 +0000 16@@ -264,7 +264,7 @@ | 1diff -ur misc/libxml2-2.9.8/include/libxml/xmlversion.h misc/build/libxml2-2.9.8/include/libxml/xmlversion.h 2--- misc/libxml2-2.9.8/include/libxml/xmlversion.h 2018-03-05 07:54:29.000000000 -0800 3+++ misc/build/libxml2-2.9.8/include/libxml/xmlversion.h 2018-08-22 22:53:15.488158000 -0700 4@@ -273,7 +273,7 @@ |
17 * 18 * Whether iconv support is available 19 */ 20-#if 1 21+#if 0 22 #define LIBXML_ICONV_ENABLED 23 #endif 24 | 5 * 6 * Whether iconv support is available 7 */ 8-#if 1 9+#if 0 10 #define LIBXML_ICONV_ENABLED 11 #endif 12 |
25@@ -291,7 +291,7 @@ | 13@@ -300,7 +300,7 @@ |
26 * 27 * Whether Debugging module is configured in 28 */ 29-#if 1 30+#if 0 31 #define LIBXML_DEBUG_ENABLED 32 #endif 33 | 14 * 15 * Whether Debugging module is configured in 16 */ 17-#if 1 18+#if 0 19 #define LIBXML_DEBUG_ENABLED 20 #endif 21 |
34@@ -300,7 +300,7 @@ 35 * 36 * Whether the memory debugging is configured in 37 */ 38-#if 1 39+#if 0 40 #define DEBUG_MEMORY_LOCATION 41 #endif 42 43@@ -309,7 +309,7 @@ 44 * 45 * Whether the runtime debugging is configured in 46 */ 47-#if 1 48+#if 0 49 #define LIBXML_DEBUG_RUNTIME 50 #endif 51 52--- misc/libxml2-2.7.8/xml2-config.in 2009-12-17 11:45:20.000000000 +0000 53+++ misc/build/libxml2-2.7.8/xml2-config.in 2009-12-17 11:45:36.000000000 +0000 | 22diff -ur misc/libxml2-2.9.8/xml2-config.in misc/build/libxml2-2.9.8/xml2-config.in 23--- misc/libxml2-2.9.8/xml2-config.in 2016-06-07 03:04:14.000000000 -0700 24+++ misc/build/libxml2-2.9.8/xml2-config.in 2018-08-22 22:53:15.489086000 -0700 |
54@@ -1,9 +1,14 @@ 55 #! /bin/sh 56 57-prefix=@prefix@ 58-exec_prefix=@exec_prefix@ 59-includedir=@includedir@ 60-libdir=@libdir@ 61+#prefix=@prefix@ --- 8 unchanged lines hidden (view full) --- 70 71 usage() 72 { 73@@ -67,7 +72,8 @@ 74 ;; 75 76 --cflags) 77- echo @XML_INCLUDEDIR@ @XML_CFLAGS@ | 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@ --- 8 unchanged lines hidden (view full) --- 41 42 usage() 43 { 44@@ -67,7 +72,8 @@ 45 ;; 46 47 --cflags) 48- echo @XML_INCLUDEDIR@ @XML_CFLAGS@ |
78+ echo -I${includedir} | 49+ echo -I${includedir} |
79+# echo @XML_INCLUDEDIR@ @XML_CFLAGS@ 80 ;; 81 82 --libtool-libs) | 50+# echo @XML_INCLUDEDIR@ @XML_CFLAGS@ 51 ;; 52 53 --libtool-libs) |
83@@ -82,19 +88,24 @@ | 54@@ -82,19 +88,26 @@ |
84 ;; 85 86 --libs) 87- if [ "`uname`" = "Linux" ] 88- then 89- if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] 90- then | 55 ;; 56 57 --libs) 58- if [ "`uname`" = "Linux" ] 59- then 60- if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] 61- then |
91- echo @XML_LIBS@ | 62- echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@ |
92- else | 63- else |
93- echo @XML_LIBDIR@ @XML_LIBS@ | 64- echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ |
94- fi 95- else | 65- fi 66- else |
96- echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@ | 67- echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ @WIN32_EXTRA_LIBADD@ |
97- fi | 68- fi |
98+ echo -L${libdir} ${LIBXML2LIB} -lm | 69+ echo -L${libdir} ${LIBXML2LIB} -lm |
99+# if [ "`uname`" = "Linux" ] 100+# then 101+# if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] 102+# then | 70+# if [ "`uname`" = "Linux" ] 71+# then 72+# if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] 73+# then |
103+# echo @XML_LIBS@ | 74+# echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@ |
104+# else | 75+# else |
105+# echo @XML_LIBDIR@ @XML_LIBS@ | 76+# echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ |
106+# fi 107+# else | 77+# fi 78+# else |
108+# echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@ | 79+# echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ @WIN32_EXTRA_LIBADD@ |
109+# fi | 80+# fi |
81+ |
|
110 ;; 111 112+ print) # ugly configure hack | 82 ;; 83 84+ print) # ugly configure hack |
113+ exit 0 114+ ;; 115+ | 85+ exit 0 86+ ;; 87+ 88+ |
116 *) 117 usage 118 exit 1 | 89 *) 90 usage 91 exit 1 |