libxslt/libxslt-1.1.24.patch

   1 --- misc/libxslt-1.1.24/ltmain.sh       Wed Aug 29 14:28:46 2007
   2 +++ misc/build/libxslt-1.1.24/ltmain.sh Wed Jun 25 13:06:05 2008
   3 @@ -3234,9 +3234,9 @@
   4             revision="$number_revision"
   5             ;;
   6           freebsd-aout|freebsd-elf|sunos)
   7 -           current="$number_major"
   8 -           revision="$number_minor"
   9 -           age="0"
  10 +           current=`expr $number_major + $number_minor`
  11 +           age="$number_minor"
  12 +           revision="$number_revision"
  13             ;;
  14           irix|nonstopux)
  15             current=`expr $number_major + $number_minor`
  16 @@ -3311,8 +3311,8 @@
  17           ;;
  18
  19         freebsd-elf)
  20 -         major=".$current"
  21 -         versuffix=".$current";
  22 +         major=.`expr $current - $age`
  23 +         versuffix="$major.$age.$revision"
  24           ;;
  25
  26         irix | nonstopux)
  27 --- misc/libxslt-1.1.24/xslt-config.in  Wed Jan 17 14:18:26 2007
  28 +++ misc/build/libxslt-1.1.24/xslt-config.in    Wed Jun 25 13:06:05 2008
  29 @@ -1,10 +1,16 @@
  30  #! /bin/sh
  31
  32 -prefix=@prefix@
  33 -exec_prefix=@exec_prefix@
  34 +#prefix=@prefix@
  35 +#exec_prefix=@exec_prefix@
  36 +#exec_prefix_set=no
  37 +#includedir=@includedir@
  38 +#libdir=@libdir@
  39 +
  40 +prefix=${SOLARVERSION}/${INPATH}
  41 +exec_prefix=${SOLARVERSION}/${INPATH}
  42  exec_prefix_set=no
  43 -includedir=@includedir@
  44 -libdir=@libdir@
  45 +includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
  46 +libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
  47
  48  usage()
  49  {
  50 @@ -89,7 +95,8 @@
  51      shift
  52  done
  53
  54 -the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@"
  55 +#the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@"
  56 +the_libs="-L${libdir} ${XSLTLIB} -lm"
  57  if test "$includedir" != "/usr/include"; then
  58      the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`"
  59  else
  60 --- misc/libxslt-1.1.24/configure       2008-05-14 00:40:54.000000000 +0900
  61 +++ misc/build/libxslt-1.1.24/configure 2008-07-17 22:12:38.097000000 +0900
  62 @@ -5730,7 +5730,7 @@
  63
  64  cygwin*)
  65    # func_win32_libid is a shell function defined in ltmain.sh
  66 -  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  67 +  lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
  68    lt_cv_file_magic_cmd='func_win32_libid'
  69    ;;
  70
  71 @@ -5739,7 +5739,7 @@
  72    # func_win32_libid shell function, so use a weaker test based on 'objdump',
  73    # unless we find 'file', for example because we are cross-compiling.
  74    if ( file / ) >/dev/null 2>&1; then
  75 -    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  76 +    lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
  77      lt_cv_file_magic_cmd='func_win32_libid'
  78    else
  79      lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'