diff options
Diffstat (limited to 'meta/packages/libtool/libtool-2.2.6/trailingslash.patch')
-rw-r--r-- | meta/packages/libtool/libtool-2.2.6/trailingslash.patch | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/meta/packages/libtool/libtool-2.2.6/trailingslash.patch b/meta/packages/libtool/libtool-2.2.6/trailingslash.patch index 71bb4c1b8f..b1956a6134 100644 --- a/meta/packages/libtool/libtool-2.2.6/trailingslash.patch +++ b/meta/packages/libtool/libtool-2.2.6/trailingslash.patch | |||
@@ -4,24 +4,6 @@ This is because libdir has a trailing slash which breaks the comparision. | |||
4 | 4 | ||
5 | RP 2/1/10 | 5 | RP 2/1/10 |
6 | 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 | 7 | Index: libtool-2.2.6/libltdl/config/ltmain.m4sh |
26 | =================================================================== | 8 | =================================================================== |
27 | --- libtool-2.2.6.orig/libltdl/config/ltmain.m4sh 2010-02-02 16:06:29.793905001 +0000 | 9 | --- libtool-2.2.6.orig/libltdl/config/ltmain.m4sh 2010-02-02 16:06:29.793905001 +0000 |