libxml2/libxml2-configure.patch

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