diff options
| -rw-r--r-- | meta/packages/libtool/libtool-2.2.6/trailingslash.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/meta/packages/libtool/libtool-2.2.6/trailingslash.patch b/meta/packages/libtool/libtool-2.2.6/trailingslash.patch new file mode 100644 index 0000000000..71bb4c1b8f --- /dev/null +++ b/meta/packages/libtool/libtool-2.2.6/trailingslash.patch | |||
| @@ -0,0 +1,42 @@ | |||
| 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 | |||
| 3 | This is because libdir has a trailing slash which breaks the comparision. | ||
| 4 | |||
| 5 | RP 2/1/10 | ||
| 6 | |||
| 7 | Index: libtool-2.2.6/libltdl/config/ltmain.sh | ||
| 8 | =================================================================== | ||
| 9 | --- libtool-2.2.6.orig/libltdl/config/ltmain.sh 2008-09-07 18:56:33.000000000 +0100 | ||
| 10 | +++ libtool-2.2.6/libltdl/config/ltmain.sh 2010-02-02 15:36:17.083936911 +0000 | ||
| 11 | @@ -2009,8 +2009,12 @@ | ||
| 12 | dir="$dir$objdir" | ||
| 13 | |||
| 14 | if test -n "$relink_command"; then | ||
| 15 | + # Strip any trailing slash from the destination. | ||
| 16 | + func_stripname '' '/' "$libdir" | ||
| 17 | + destlibdir=$func_stripname_result | ||
| 18 | + | ||
| 19 | # Determine the prefix the user has applied to our future dir. | ||
| 20 | - inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` | ||
| 21 | + inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$destlibdir\$%%"` | ||
| 22 | |||
| 23 | # Don't allow the user to place us outside of our expected | ||
| 24 | # location b/c this prevents finding dependent libraries that | ||
| 25 | Index: libtool-2.2.6/libltdl/config/ltmain.m4sh | ||
| 26 | =================================================================== | ||
| 27 | --- libtool-2.2.6.orig/libltdl/config/ltmain.m4sh 2010-02-02 16:06:29.793905001 +0000 | ||
| 28 | +++ libtool-2.2.6/libltdl/config/ltmain.m4sh 2010-02-02 16:06:59.415155959 +0000 | ||
| 29 | @@ -1567,8 +1567,12 @@ | ||
| 30 | dir="$dir$objdir" | ||
| 31 | |||
| 32 | if test -n "$relink_command"; then | ||
| 33 | + # Strip any trailing slash from the destination. | ||
| 34 | + func_stripname '' '/' "$libdir" | ||
| 35 | + destlibdir=$func_stripname_result | ||
| 36 | + | ||
| 37 | # Determine the prefix the user has applied to our future dir. | ||
| 38 | - inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` | ||
| 39 | + inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$destlibdir\$%%"` | ||
| 40 | |||
| 41 | # Don't allow the user to place us outside of our expected | ||
| 42 | # location b/c this prevents finding dependent libraries that | ||