libxslt/libxslt-configure.patch

   1 --- misc/libxslt-1.1.26/config.sub      2008-01-30 21:27:02.000000000 +0100
   2 +++ misc/build/libxslt-1.1.26/config.sub        2011-09-26 23:35:00.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-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
   9    uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
  10    storm-chaos* | os2-emx* | rtmk-nova*)
  11      os=-$maybe_os
  12 @@ -1218,7 +1218,7 @@
  13               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  14               | -chorusos* | -chorusrdb* \
  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/libxslt-1.1.26/ltmain.sh       Wed Aug 29 14:28:46 2007
  22 +++ misc/build/libxslt-1.1.26/ltmain.sh Wed Jun 25 13:06:05 2008
  23 @@ -6195,9 +6195,9 @@
  24             revision="$number_revision"
  25             ;;
  26           freebsd-aout|freebsd-elf|sunos)
  27 -           current="$number_major"
  28 -           revision="$number_minor"
  29 -           age="0"
  30 +           current=`expr $number_major + $number_minor`
  31 +           age="$number_minor"
  32 +           revision="$number_revision"
  33             ;;
  34           irix|nonstopux)
  35             func_arith $number_major + $number_minor
  36 @@ -6271,8 +6271,8 @@
  37           ;;
  38
  39         freebsd-elf)
  40 -         major=".$current"
  41 -         versuffix=".$current"
  42 +         major=.`expr $current - $age`
  43 +         versuffix="$major.$age.$revision"
  44           ;;
  45
  46         irix | nonstopux)
  47 --- misc/libxslt-1.1.26/xslt-config.in  Wed Jan 17 14:18:26 2007
  48 +++ misc/build/libxslt-1.1.26/xslt-config.in    Wed Jun 25 13:06:05 2008
  49 @@ -1,10 +1,16 @@
  50  #! /bin/sh
  51
  52 -prefix=@prefix@
  53 -exec_prefix=@exec_prefix@
  54 +#prefix=@prefix@
  55 +#exec_prefix=@exec_prefix@
  56 +#exec_prefix_set=no
  57 +#includedir=@includedir@
  58 +#libdir=@libdir@
  59 +
  60 +prefix=${SOLARVERSION}/${INPATH}
  61 +exec_prefix=${SOLARVERSION}/${INPATH}
  62  exec_prefix_set=no
  63 -includedir=@includedir@
  64 -libdir=@libdir@
  65 +includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
  66 +libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
  67
  68  usage()
  69  {
  70 @@ -89,7 +95,8 @@
  71      shift
  72  done
  73
  74 -the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@"
  75 +#the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@"
  76 +the_libs="-L${libdir} ${XSLTLIB} -lm"
  77  if test "$includedir" != "/usr/include"; then
  78      the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`"
  79  else
  80 --- misc/libxslt-1.1.26/configure       2008-05-14 00:40:54.000000000 +0900
  81 +++ misc/build/libxslt-1.1.26/configure 2008-07-17 22:12:38.097000000 +0900
  82 @@ -7437,7 +7437,7 @@
  83
  84  cygwin*)
  85    # func_win32_libid is a shell function defined in ltmain.sh
  86 -  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  87 +  lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
  88    lt_cv_file_magic_cmd='func_win32_libid'
  89    ;;
  90
  91 @@ -7446,7 +7446,7 @@
  92    # func_win32_libid shell function, so use a weaker test based on 'objdump',
  93    # unless we find 'file', for example because we are cross-compiling.
  94    if ( file / ) >/dev/null 2>&1; then
  95 -    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  96 +    lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
  97      lt_cv_file_magic_cmd='func_win32_libid'
  98    else
  99      lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'