150-trailingslash.patch 1.9 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849
  1. A command like /bin/sh ../../i586-poky-linux-libtool --mode=install /usr/bin/install -c gck-roots-store-standalone.la '/media/data1/builds/poky1/tmp/work/core2-poky-linux/gnome-keyring-2.26.1-r1/image/usr/lib/gnome-keyring/standalone/' fails (e.g. gnome-keyring or pulseaudio)
  2. This is because libdir has a trailing slash which breaks the comparision.
  3. RP 2/1/10
  4. Merged a patch received from Gary Thomas <gary@mlbassoc.com>
  5. Date: 2010/07/12
  6. Nitin A Kamble <nitin.a.kamble@intel.com>
  7. --- a/libltdl/config/ltmain.m4sh
  8. +++ b/libltdl/config/ltmain.m4sh
  9. @@ -2164,8 +2164,15 @@ func_mode_install ()
  10. func_append dir "$objdir"
  11. if test -n "$relink_command"; then
  12. + # Strip any trailing slash from the destination.
  13. + func_stripname '' '/' "$libdir"
  14. + destlibdir=$func_stripname_result
  15. +
  16. + func_stripname '' '/' "$destdir"
  17. + s_destdir=$func_stripname_result
  18. +
  19. # Determine the prefix the user has applied to our future dir.
  20. - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
  21. + inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
  22. # Don't allow the user to place us outside of our expected
  23. # location b/c this prevents finding dependent libraries that
  24. --- a/libltdl/config/ltmain.sh
  25. +++ b/libltdl/config/ltmain.sh
  26. @@ -2953,8 +2953,15 @@ func_mode_install ()
  27. func_append dir "$objdir"
  28. if test -n "$relink_command"; then
  29. + # Strip any trailing slash from the destination.
  30. + func_stripname '' '/' "$libdir"
  31. + destlibdir=$func_stripname_result
  32. +
  33. + func_stripname '' '/' "$destdir"
  34. + s_destdir=$func_stripname_result
  35. +
  36. # Determine the prefix the user has applied to our future dir.
  37. - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
  38. + inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
  39. # Don't allow the user to place us outside of our expected
  40. # location b/c this prevents finding dependent libraries that