org.handhelds.familiar/packages/libtool/libtool-1.5/libdir-la.patch

   1
   2 #
   3 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
   4 #
   5
   6 --- libtool-1.5/ltmain.in~libdir-la
   7 +++ libtool-1.5/ltmain.in
   8 @@ -2082,8 +2082,14 @@
   9             absdir="$abs_ladir"
  10             libdir="$abs_ladir"
  11           else
  12 -           dir="$libdir"
  13 -           absdir="$libdir"
  14 +            # Adding 'libdir' from the .la file to our library search paths
  15 +            # breaks crosscompilation horribly.  We cheat here and don't add
  16 +            # it, instead adding the path where we found the .la.  -CL
  17 +           dir="$abs_ladir"
  18 +           absdir="$abs_ladir"
  19 +           libdir="$abs_ladir"
  20 +           #dir="$libdir"
  21 +           #absdir="$libdir"
  22           fi
  23         else
  24           dir="$ladir/$objdir"
  25 @@ -2545,16 +2551,16 @@
  26                 esac
  27                 if grep "^installed=no" $deplib > /dev/null; then
  28                   path="$absdir/$objdir"
  29 -               else
  30 -                 eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  31 -                 if test -z "$libdir"; then
  32 -                   $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
  33 -                   exit 1
  34 -                 fi
  35 -                 if test "$absdir" != "$libdir"; then
  36 -                   $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
  37 -                 fi
  38 -                 path="$absdir"
  39 +#              else
  40 +#                eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  41 +#                if test -z "$libdir"; then
  42 +#                  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
  43 +#                  exit 1
  44 +#                fi
  45 +#                if test "$absdir" != "$libdir"; then
  46 +#                  $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
  47 +#                fi
  48 +#                path="$absdir"
  49                 fi
  50                 depdepl=
  51                 case $host in
  52 @@ -5072,6 +5072,10 @@
  53             # Replace all uninstalled libtool libraries with the installed ones
  54             newdependency_libs=
  55             for deplib in $dependency_libs; do
  56 +              # Replacing uninstalled with installed can easily break crosscompilation,
  57 +              # since the installed path is generally the wrong architecture.  -CL
  58 +              newdependency_libs="$newdependency_libs $deplib"
  59 +              continue
  60               case $deplib in
  61               *.la)
  62                 name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`