package/cairo/libdir-la.patch

   1 --- cairo/ltmain.sh.orig        2004-11-23 09:19:19.000000000 -0700
   2 +++ cairo/ltmain.sh     2007-01-13 14:36:53.000000000 -0700
   3 @@ -231,8 +231,9 @@
   4         # line option must be used.
   5         if test -z "$tagname"; then
   6           $echo "$modename: unable to infer tagged configuration"
   7 -         $echo "$modename: specify a tag with \`--tag'" 1>&2
   8 -         exit $EXIT_FAILURE
   9 +         $echo "$modename: defaulting to \`CC'"
  10 +         $echo "$modename: if this is not correct, specify a tag with \`--tag'"
  11 +#        exit $EXIT_FAILURE
  12  #        else
  13  #          $echo "$modename: using $tagname tagged configuration"
  14         fi
  15 @@ -2279,8 +2280,14 @@
  16             absdir="$abs_ladir"
  17             libdir="$abs_ladir"
  18           else
  19 -           dir="$libdir"
  20 -           absdir="$libdir"
  21 +            # Adding 'libdir' from the .la file to our library search paths
  22 +            # breaks crosscompilation horribly.  We cheat here and don't add
  23 +            # it, instead adding the path where we found the .la.  -CL
  24 +           dir="$abs_ladir"
  25 +           absdir="$abs_ladir"
  26 +           libdir="$abs_ladir"
  27 +           #dir="$libdir"
  28 +           #absdir="$libdir"
  29           fi
  30         else
  31           if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
  32 @@ -2754,6 +2761,16 @@
  33                 esac
  34                 if grep "^installed=no" $deplib > /dev/null; then
  35                   path="$absdir/$objdir"
  36 +#              This interferes with crosscompilation. -CL
  37 +#              else
  38 +#                eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  39 +#                if test -z "$libdir"; then
  40 +#                  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
  41 +#                  exit 1
  42 +#                fi
  43 +#                if test "$absdir" != "$libdir"; then
  44 +#                  $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
  45 +#                fi
  46                 else
  47                   eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  48                   if test -z "$libdir"; then
  49 @@ -5141,6 +5158,10 @@
  50             # Replace all uninstalled libtool libraries with the installed ones
  51             newdependency_libs=
  52             for deplib in $dependency_libs; do
  53 +              # Replacing uninstalled with installed can easily break crosscompilation,
  54 +              # since the installed path is generally the wrong architecture.  -CL
  55 +              newdependency_libs="$newdependency_libs $deplib"
  56 +              continue
  57               case $deplib in
  58               *.la)
  59                 name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
  60 @@ -5459,10 +5480,13 @@
  61           # At present, this check doesn't affect windows .dll's that
  62           # are installed into $libdir/../bin (currently, that works fine)
  63           # but it's something to keep an eye on.
  64 -         if test "$inst_prefix_dir" = "$destdir"; then
  65 -           $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
  66 -           exit $EXIT_FAILURE
  67 -         fi
  68 +         #
  69 +         # This breaks install into our staging area.  -PB
  70 +         #
  71 +         # if test "$inst_prefix_dir" = "$destdir"; then
  72 +         #   $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
  73 +         #   exit $EXIT_FAILURE
  74 +         # fi
  75
  76           if test -n "$inst_prefix_dir"; then
  77             # Stick the inst_prefix_dir data into the link command.