buildroot-libtool-v2.4.patch 3.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889
  1. --- a/ltmain.sh 2014-07-30 22:21:24.664684143 +0200
  2. +++ b/ltmain.sh 2014-07-30 22:23:02.440687625 +0200
  3. @@ -1417,8 +1417,8 @@
  4. # was found and let the user know that the "--tag" command
  5. # line option must be used.
  6. if test -z "$tagname"; then
  7. - func_echo "unable to infer tagged configuration"
  8. - func_fatal_error "specify a tag with \`--tag'"
  9. + func_echo "defaulting to \`CC'"
  10. + func_echo "if this is not correct, specify a tag with \`--tag'"
  11. # else
  12. # func_verbose "using $tagname tagged configuration"
  13. fi
  14. @@ -2963,8 +2963,11 @@
  15. # At present, this check doesn't affect windows .dll's that
  16. # are installed into $libdir/../bin (currently, that works fine)
  17. # but it's something to keep an eye on.
  18. - test "$inst_prefix_dir" = "$destdir" && \
  19. - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
  20. + #
  21. + # This breaks install into our staging area. -PB
  22. + #
  23. + # test "$inst_prefix_dir" = "$destdir" && \
  24. + # func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
  25. if test -n "$inst_prefix_dir"; then
  26. # Stick the inst_prefix_dir data into the link command.
  27. @@ -5176,7 +5179,8 @@
  28. ;;
  29. -all-static | -static | -static-libtool-libs)
  30. case $arg in
  31. - -all-static)
  32. + # Make -static behave like -all-static
  33. + -all-static | -static)
  34. if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
  35. func_warning "complete static linking is impossible in this configuration"
  36. fi
  37. @@ -5185,12 +5189,6 @@
  38. fi
  39. prefer_static_libs=yes
  40. ;;
  41. - -static)
  42. - if test -z "$pic_flag" && test -n "$link_static_flag"; then
  43. - dlopen_self=$dlopen_self_static
  44. - fi
  45. - prefer_static_libs=built
  46. - ;;
  47. -static-libtool-libs)
  48. if test -z "$pic_flag" && test -n "$link_static_flag"; then
  49. dlopen_self=$dlopen_self_static
  50. @@ -5473,7 +5471,8 @@
  51. prevarg="$arg"
  52. case $arg in
  53. - -all-static)
  54. + # Make -static behave like -all-static
  55. + -all-static | -static)
  56. if test -n "$link_static_flag"; then
  57. # See comment for -static flag below, for more details.
  58. func_append compile_command " $link_static_flag"
  59. @@ -5754,7 +5753,7 @@
  60. continue
  61. ;;
  62. - -static | -static-libtool-libs)
  63. + -static-libtool-libs)
  64. # The effects of -static are defined in a previous loop.
  65. # We used to do the same as -all-static on platforms that
  66. # didn't have a PIC flag, but the assumption that the effects
  67. @@ -6697,7 +6696,7 @@
  68. *)
  69. if test "$installed" = no; then
  70. func_append notinst_deplibs " $lib"
  71. - need_relink=yes
  72. + need_relink=no
  73. fi
  74. ;;
  75. esac
  76. @@ -9275,6 +9274,10 @@
  77. # Replace all uninstalled libtool libraries with the installed ones
  78. newdependency_libs=
  79. for deplib in $dependency_libs; do
  80. + # Replacing uninstalled with installed can easily break crosscompilation,
  81. + # since the installed path is generally the wrong architecture. -CL
  82. + newdependency_libs="$newdependency_libs $deplib"
  83. + continue
  84. case $deplib in
  85. *.la)
  86. func_basename "$deplib"