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

   1
   2 #
   3 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
   4 #
   5
   6 --- libtool-1.5.6/ltmain.in~libdir-la   2004-04-01 21:46:15.000000000 -0600
   7 +++ libtool-1.5.6/ltmain.in     2004-05-14 22:53:51.000000000 -0500
   8 @@ -2147,8 +2147,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 @@ -2615,6 +2621,16 @@
  26                 esac
  27                 if grep "^installed=no" $deplib > /dev/null; then
  28                   path="$absdir/$objdir"
  29 +#              This interferes with crosscompilation. -CL
  30 +#              else
  31 +#                eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  32 +#                if test -z "$libdir"; then
  33 +#                  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
  34 +#                  exit 1
  35 +#                fi
  36 +#                if test "$absdir" != "$libdir"; then
  37 +#                  $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
  38 +#                fi
  39                 else
  40                   eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  41                   if test -z "$libdir"; then
  42 @@ -5165,6 +5181,10 @@
  43             # Replace all uninstalled libtool libraries with the installed ones
  44             newdependency_libs=
  45             for deplib in $dependency_libs; do
  46 +              # Replacing uninstalled with installed can easily break crosscompilation,
  47 +              # since the installed path is generally the wrong architecture.  -CL
  48 +              newdependency_libs="$newdependency_libs $deplib"
  49 +              continue
  50               case $deplib in
  51               *.la)
  52                 name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`