libxml2/libxml2-configure.patch

   1 --- misc/libxml2-2.7.6/config.sub       2009-06-11 11:29:50.000000000 +0200
   2 +++ misc/build/libxml2-2.7.6/config.sub 2011-09-26 18:05:31.000000000 +0200
   3 @@ -120,7 +120,7 @@
   4  # Here we must recognize all the valid KERNEL-OS combinations.
   5  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
   6  case $maybe_os in
   7 -  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
   8 +  nto-qnx* | linux-gnu* | linux-dietlibc | linux-android* | linux-newlib* | linux-uclibc* | \
   9    uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
  10    kopensolaris*-gnu* | \
  11    storm-chaos* | os2-emx* | rtmk-nova*)
  12 @@ -1275,7 +1275,7 @@
  13               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  14               | -chorusos* | -chorusrdb* | -cegcc* \
  15               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  16 -             | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
  17 +             | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
  18               | -uxpv* | -beos* | -mpeix* | -udk* \
  19               | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
  20               | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
  21 --- misc/libxml2-2.7.6/Makefile.in
  22 +++ misc/build/libxml2-2.7.6/Makefile.in
  23 @@ -41,9 +41,9 @@
  24         testSAX$(EXEEXT) testHTML$(EXEEXT) testXPath$(EXEEXT) \
  25         testURI$(EXEEXT) testThreads$(EXEEXT) testC14N$(EXEEXT) \
  26         testAutomata$(EXEEXT) testRegexp$(EXEEXT) testReader$(EXEEXT) \
  27 -       testapi$(EXEEXT) testModule$(EXEEXT) runtest$(EXEEXT) \
  28 +       testapi$(EXEEXT) testModule$(EXEEXT) \
  29         runsuite$(EXEEXT) testchar$(EXEEXT) testdict$(EXEEXT) \
  30 -       runxmlconf$(EXEEXT) testrecurse$(EXEEXT)
  31 +       runxmlconf$(EXEEXT)
  32  bin_PROGRAMS = xmllint$(EXEEXT) xmlcatalog$(EXEEXT)
  33  subdir = .
  34  DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
  35 --- misc/libxml2-2.7.6/ltmain.sh        2009-10-06 17:39:54.000000000 +0100
  36 +++ misc/build/libxml2-2.7.6/ltmain.sh  2009-12-17 11:43:56.000000000 +0000
  37 @@ -6271,8 +6271,8 @@
  38           ;;
  39
  40         freebsd-elf)
  41 -         major=".$current"
  42 -         versuffix=".$current"
  43 +         major=.`expr $current - $age`
  44 +         versuffix=".$major.$age.$revision";
  45           ;;
  46
  47         irix | nonstopux)
  48 --- misc/libxml2-2.7.6/include/libxml/xmlversion.h      2009-12-17 11:45:19.000000000 +0000
  49 +++ misc/build/libxml2-2.7.6/include/libxml/xmlversion.h        2009-12-17 11:45:36.000000000 +0000
  50 @@ -264,7 +264,7 @@
  51   *
  52   * Whether iconv support is available
  53   */
  54 -#if 1
  55 +#if 0
  56  #define LIBXML_ICONV_ENABLED
  57  #endif
  58
  59 @@ -282,7 +282,7 @@
  60   *
  61   * Whether Debugging module is configured in
  62   */
  63 -#if 1
  64 +#if 0
  65  #define LIBXML_DEBUG_ENABLED
  66  #endif
  67
  68 @@ -291,7 +291,7 @@
  69   *
  70   * Whether the memory debugging is configured in
  71   */
  72 -#if 1
  73 +#if 0
  74  #define DEBUG_MEMORY_LOCATION
  75  #endif
  76
  77 @@ -300,7 +300,7 @@
  78   *
  79   * Whether the runtime debugging is configured in
  80   */
  81 -#if 1
  82 +#if 0
  83  #define LIBXML_DEBUG_RUNTIME
  84  #endif
  85
  86 --- misc/libxml2-2.7.6/xml2-config.in   2009-12-17 11:45:20.000000000 +0000
  87 +++ misc/build/libxml2-2.7.6/xml2-config.in     2009-12-17 11:45:36.000000000 +0000
  88 @@ -1,9 +1,14 @@
  89  #! /bin/sh
  90
  91 -prefix=@prefix@
  92 -exec_prefix=@exec_prefix@
  93 -includedir=@includedir@
  94 -libdir=@libdir@
  95 +#prefix=@prefix@
  96 +#exec_prefix=@exec_prefix@
  97 +#includedir=@includedir@
  98 +#libdir=@libdir@
  99 +
 100 +prefix=${SOLARVERSION}/${INPATH}
 101 +exec_prefix=${SOLARVERSION}/${INPATH}
 102 +includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
 103 +libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
 104
 105  usage()
 106  {
 107 @@ -67,7 +72,8 @@
 108         ;;
 109
 110      --cflags)
 111 -               echo @XML_INCLUDEDIR@ @XML_CFLAGS@
 112 +        echo -I${includedir}
 113 +#              echo @XML_INCLUDEDIR@ @XML_CFLAGS@
 114                 ;;
 115
 116      --libtool-libs)
 117 @@ -82,19 +88,24 @@
 118                 ;;
 119
 120      --libs)
 121 -        if [ "`uname`" = "Linux" ]
 122 -       then
 123 -           if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
 124 -           then
 125 -               echo @XML_LIBS@
 126 -           else
 127 -               echo @XML_LIBDIR@ @XML_LIBS@
 128 -           fi
 129 -       else
 130 -           echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@
 131 -       fi
 132 +        echo -L${libdir} ${LIBXML2LIB} -lm
 133 +#        if [ "`uname`" = "Linux" ]
 134 +#      then
 135 +#          if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
 136 +#          then
 137 +#              echo @XML_LIBS@
 138 +#          else
 139 +#              echo @XML_LIBDIR@ @XML_LIBS@
 140 +#          fi
 141 +#      else
 142 +#          echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@
 143 +#      fi
 144                 ;;
 145
 146 +    print) # ugly configure hack
 147 +        exit 0
 148 +        ;;
 149 +
 150      *)
 151         usage
 152         exit 1