diff options
Diffstat (limited to 'meta/packages/libtool/libtool/trailingslash.patch')
-rw-r--r-- | meta/packages/libtool/libtool/trailingslash.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/meta/packages/libtool/libtool/trailingslash.patch b/meta/packages/libtool/libtool/trailingslash.patch new file mode 100644 index 0000000000..f51c06406e --- /dev/null +++ b/meta/packages/libtool/libtool/trailingslash.patch | |||
@@ -0,0 +1,24 @@ | |||
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.10/libltdl/config/ltmain.m4sh | ||
8 | =================================================================== | ||
9 | --- libtool-2.2.10.orig/libltdl/config/ltmain.m4sh | ||
10 | +++ libtool-2.2.10/libltdl/config/ltmain.m4sh | ||
11 | @@ -1634,8 +1634,12 @@ func_mode_install () | ||
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 "$destdir" | $SED -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 | ||