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