diff options
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool/trailingslash.patch')
-rw-r--r-- | meta/recipes-devtools/libtool/libtool/trailingslash.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/trailingslash.patch b/meta/recipes-devtools/libtool/libtool/trailingslash.patch deleted file mode 100644 index e8824d7db9..0000000000 --- a/meta/recipes-devtools/libtool/libtool/trailingslash.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | 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) | ||
4 | |||
5 | This is because libdir has a trailing slash which breaks the comparision. | ||
6 | |||
7 | RP 2/1/10 | ||
8 | |||
9 | Merged a patch received from Gary Thomas <gary@mlbassoc.com> | ||
10 | |||
11 | Date: 2010/07/12 | ||
12 | Nitin A Kamble <nitin.a.kamble@intel.com> | ||
13 | |||
14 | Updated by: Robert Yang <liezhi.yang@windriver.com> | ||
15 | |||
16 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | ||
17 | --- a/build-aux/ltmain.in | ||
18 | +++ b/build-aux/ltmain.in | ||
19 | @@ -2356,8 +2356,15 @@ func_mode_install () | ||
20 | func_append dir "$objdir" | ||
21 | |||
22 | if test -n "$relink_command"; then | ||
23 | + # Strip any trailing slash from the destination. | ||
24 | + func_stripname '' '/' "$libdir" | ||
25 | + destlibdir=$func_stripname_result | ||
26 | + | ||
27 | + func_stripname '' '/' "$destdir" | ||
28 | + s_destdir=$func_stripname_result | ||
29 | + | ||
30 | # Determine the prefix the user has applied to our future dir. | ||
31 | - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` | ||
32 | + inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` | ||
33 | |||
34 | # Don't allow the user to place us outside of our expected | ||
35 | # location b/c this prevents finding dependent libraries that | ||