summaryrefslogtreecommitdiff
path: root/meta/packages/libtool/libtool-2.2.6/trailingslash.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/libtool/libtool-2.2.6/trailingslash.patch')
-rw-r--r--meta/packages/libtool/libtool-2.2.6/trailingslash.patch24
1 files changed, 0 insertions, 24 deletions
diff --git a/meta/packages/libtool/libtool-2.2.6/trailingslash.patch b/meta/packages/libtool/libtool-2.2.6/trailingslash.patch
deleted file mode 100644
index b1956a613..000000000
--- a/meta/packages/libtool/libtool-2.2.6/trailingslash.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
-
-Index: libtool-2.2.6/libltdl/config/ltmain.m4sh
-===================================================================
---- libtool-2.2.6.orig/libltdl/config/ltmain.m4sh 2010-02-02 16:06:29.793905001 +0000
-+++ libtool-2.2.6/libltdl/config/ltmain.m4sh 2010-02-02 16:06:59.415155959 +0000
-@@ -1567,8 +1567,12 @@
- dir="$dir$objdir"
-
- if test -n "$relink_command"; then
-+ # Strip any trailing slash from the destination.
-+ func_stripname '' '/' "$libdir"
-+ destlibdir=$func_stripname_result
-+
- # Determine the prefix the user has applied to our future dir.
-- inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
-+ inst_prefix_dir=`$ECHO "X$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