package/gettext/libdir-la.patch

   1 --- gettext-0.14.6/autoconf-lib-link/build-aux/ltmain.sh.orig   2007-01-13 14:33:23.000000000 -0700
   2 +++ gettext-0.14.6/autoconf-lib-link/build-aux/ltmain.sh        2007-01-13 14:35:10.000000000 -0700
   3 @@ -234,8 +234,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 @@ -2324,8 +2325,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           test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
  31         else
  32 @@ -2800,6 +2807,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 @@ -5210,6 +5227,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 @@ -5528,10 +5549,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.
  78 --- gettext-0.14.6/build-aux/ltmain.sh.orig     2005-05-20 15:03:38.000000000 -0600
  79 +++ gettext-0.14.6/build-aux/ltmain.sh  2007-01-13 14:34:27.000000000 -0700
  80 @@ -234,8 +234,9 @@
  81         # line option must be used.
  82         if test -z "$tagname"; then
  83           $echo "$modename: unable to infer tagged configuration"
  84 -         $echo "$modename: specify a tag with \`--tag'" 1>&2
  85 -         exit $EXIT_FAILURE
  86 +         $echo "$modename: defaulting to \`CC'"
  87 +         $echo "$modename: if this is not correct, specify a tag with \`--tag'"
  88 +#        exit $EXIT_FAILURE
  89  #        else
  90  #          $echo "$modename: using $tagname tagged configuration"
  91         fi
  92 @@ -2324,8 +2325,14 @@
  93             absdir="$abs_ladir"
  94             libdir="$abs_ladir"
  95           else
  96 -           dir="$libdir"
  97 -           absdir="$libdir"
  98 +            # Adding 'libdir' from the .la file to our library search paths
  99 +            # breaks crosscompilation horribly.  We cheat here and don't add
 100 +            # it, instead adding the path where we found the .la.  -CL
 101 +           dir="$abs_ladir"
 102 +           absdir="$abs_ladir"
 103 +           libdir="$abs_ladir"
 104 +           #dir="$libdir"
 105 +           #absdir="$libdir"
 106           fi
 107           test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
 108         else
 109 @@ -2800,6 +2807,16 @@
 110                 esac
 111                 if grep "^installed=no" $deplib > /dev/null; then
 112                   path="$absdir/$objdir"
 113 +#              This interferes with crosscompilation. -CL
 114 +#              else
 115 +#                eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 116 +#                if test -z "$libdir"; then
 117 +#                  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
 118 +#                  exit 1
 119 +#                fi
 120 +#                if test "$absdir" != "$libdir"; then
 121 +#                  $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
 122 +#                fi
 123                 else
 124                   eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 125                   if test -z "$libdir"; then
 126 @@ -5210,6 +5227,10 @@
 127             # Replace all uninstalled libtool libraries with the installed ones
 128             newdependency_libs=
 129             for deplib in $dependency_libs; do
 130 +              # Replacing uninstalled with installed can easily break crosscompilation,
 131 +              # since the installed path is generally the wrong architecture.  -CL
 132 +              newdependency_libs="$newdependency_libs $deplib"
 133 +              continue
 134               case $deplib in
 135               *.la)
 136                 name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
 137 @@ -5528,10 +5549,13 @@
 138           # At present, this check doesn't affect windows .dll's that
 139           # are installed into $libdir/../bin (currently, that works fine)
 140           # but it's something to keep an eye on.
 141 -         if test "$inst_prefix_dir" = "$destdir"; then
 142 -           $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
 143 -           exit $EXIT_FAILURE
 144 -         fi
 145 +         #
 146 +         # This breaks install into our staging area.  -PB
 147 +         #
 148 +         # if test "$inst_prefix_dir" = "$destdir"; then
 149 +         #   $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
 150 +         #   exit $EXIT_FAILURE
 151 +         # fi
 152
 153           if test -n "$inst_prefix_dir"; then
 154             # Stick the inst_prefix_dir data into the link command.