mirror of
https://git.yoctoproject.org/poky
synced 2026-02-23 18:09:40 +01:00
42d2170f86
python: update upstream-status for patches binutils: update upstream-status for patches gcc 4.5.1 4.6.0: update upstream-status for patches autoconf: update upstream-status for patches automake: update upstream-status for patches bison: update upstream-status for patches distcc: update upstream-status of patches fstests: update upstream-status for patches gdb: update upstream-status of patches intltool: update upstream-status of patches libtool: update upstream status of patches linux-libc-headers: update upstream-status for patches make: update upstream-status for patches perl: update upstream-status for patches python-pycurl: update upstream-status for patches python-pygobject: update upstream status for patches python-pyrex: update upstream-status for patches quilt: update upstream-status of patches tcl: update upstream-status for patches gnu-config: update upstream-status for patches gmp: update upstream-status for patches (From OE-Core rev: a62fa9b213b09bf48c48499d2e3c66a9ee306deb) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
Upstream-Status: Pending
|
|
|
|
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)
|
|
|
|
This is because libdir has a trailing slash which breaks the comparision.
|
|
|
|
RP 2/1/10
|
|
|
|
Merged a patch received from Gary Thomas <gary@mlbassoc.com>
|
|
|
|
Date: 2010/07/12
|
|
Nitin A Kamble <nitin.a.kamble@intel.com>
|
|
|
|
Index: libtool-2.2.10/libltdl/config/ltmain.m4sh
|
|
===================================================================
|
|
--- libtool-2.2.10.orig/libltdl/config/ltmain.m4sh
|
|
+++ libtool-2.2.10/libltdl/config/ltmain.m4sh
|
|
@@ -1634,8 +1634,15 @@ func_mode_install ()
|
|
dir="$dir$objdir"
|
|
|
|
if test -n "$relink_command"; then
|
|
+ # Strip any trailing slash from the destination.
|
|
+ func_stripname '' '/' "$libdir"
|
|
+ destlibdir=$func_stripname_result
|
|
+
|
|
+ func_stripname '' '/' "$destdir"
|
|
+ s_destdir=$func_stripname_result
|
|
+
|
|
# Determine the prefix the user has applied to our future dir.
|
|
- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
|
|
+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
|
|
|
|
# Don't allow the user to place us outside of our expected
|
|
# location b/c this prevents finding dependent libraries that
|