100-libdir-fixes.patch 3.1 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394
  1. --- a/libltdl/config/ltmain.m4sh
  2. +++ b/libltdl/config/ltmain.m4sh
  3. @@ -5715,8 +5715,14 @@ func_mode_link ()
  4. absdir="$abs_ladir"
  5. libdir="$abs_ladir"
  6. else
  7. - dir="$lt_sysroot$libdir"
  8. - absdir="$lt_sysroot$libdir"
  9. + # Adding 'libdir' from the .la file to our library search paths
  10. + # breaks crosscompilation horribly. We cheat here and don't add
  11. + # it, instead adding the path where we found the .la. -CL
  12. + dir="$lt_sysroot$abs_ladir"
  13. + absdir="$abs_ladir"
  14. + libdir="$abs_ladir"
  15. + #dir="$libdir"
  16. + #absdir="$lt_sysroot$libdir"
  17. fi
  18. test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
  19. else
  20. @@ -6114,8 +6120,6 @@ func_mode_link ()
  21. add="$libdir/$linklib"
  22. fi
  23. else
  24. - # We cannot seem to hardcode it, guess we'll fake it.
  25. - add_dir="-L$libdir"
  26. # Try looking first in the location we're being installed to.
  27. if test -n "$inst_prefix_dir"; then
  28. case $libdir in
  29. @@ -6270,7 +6274,17 @@ func_mode_link ()
  30. fi
  31. ;;
  32. *)
  33. - path="-L$absdir/$objdir"
  34. + # OE sets installed=no in staging. We need to look in $objdir and $absdir,
  35. + # preferring $objdir. RP 31/04/2008
  36. + if test -f "$absdir/$objdir/$depdepl" ; then
  37. + depdepl="$absdir/$objdir/$depdepl"
  38. + path="-L$absdir/$objdir"
  39. + elif test -f "$absdir/$depdepl" ; then
  40. + depdepl="$absdir/$depdepl"
  41. + path="-L$absdir"
  42. + else
  43. + path="-L$absdir/$objdir"
  44. + fi
  45. ;;
  46. esac
  47. else
  48. --- a/libltdl/config/ltmain.sh
  49. +++ b/libltdl/config/ltmain.sh
  50. @@ -6504,8 +6504,14 @@ func_mode_link ()
  51. absdir="$abs_ladir"
  52. libdir="$abs_ladir"
  53. else
  54. - dir="$lt_sysroot$libdir"
  55. - absdir="$lt_sysroot$libdir"
  56. + # Adding 'libdir' from the .la file to our library search paths
  57. + # breaks crosscompilation horribly. We cheat here and don't add
  58. + # it, instead adding the path where we found the .la. -CL
  59. + dir="$lt_sysroot$abs_ladir"
  60. + absdir="$abs_ladir"
  61. + libdir="$abs_ladir"
  62. + #dir="$libdir"
  63. + #absdir="$lt_sysroot$libdir"
  64. fi
  65. test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
  66. else
  67. @@ -6903,8 +6909,6 @@ func_mode_link ()
  68. add="$libdir/$linklib"
  69. fi
  70. else
  71. - # We cannot seem to hardcode it, guess we'll fake it.
  72. - add_dir="-L$libdir"
  73. # Try looking first in the location we're being installed to.
  74. if test -n "$inst_prefix_dir"; then
  75. case $libdir in
  76. @@ -7059,7 +7063,17 @@ func_mode_link ()
  77. fi
  78. ;;
  79. *)
  80. - path="-L$absdir/$objdir"
  81. + # OE sets installed=no in staging. We need to look in $objdir and $absdir,
  82. + # preferring $objdir. RP 31/04/2008
  83. + if test -f "$absdir/$objdir/$depdepl" ; then
  84. + depdepl="$absdir/$objdir/$depdepl"
  85. + path="-L$absdir/$objdir"
  86. + elif test -f "$absdir/$depdepl" ; then
  87. + depdepl="$absdir/$depdepl"
  88. + path="-L$absdir"
  89. + else
  90. + path="-L$absdir/$objdir"
  91. + fi
  92. ;;
  93. esac
  94. else