From 648290d5bf4d6ff50d3643bb7ad902dfc23aa702 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 1 Jun 2010 14:49:54 +0100 Subject: libtool: Make sure ltmain.sh is always regenerated. We can't just remove it since it has to be present to run configure --- .../packages/libtool/libtool-2.2.6/trailingslash.patch | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'meta/packages/libtool/libtool-2.2.6') diff --git a/meta/packages/libtool/libtool-2.2.6/trailingslash.patch b/meta/packages/libtool/libtool-2.2.6/trailingslash.patch index 71bb4c1b8..b1956a613 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. RP 2/1/10 -Index: libtool-2.2.6/libltdl/config/ltmain.sh -=================================================================== ---- libtool-2.2.6.orig/libltdl/config/ltmain.sh 2008-09-07 18:56:33.000000000 +0100 -+++ libtool-2.2.6/libltdl/config/ltmain.sh 2010-02-02 15:36:17.083936911 +0000 -@@ -2009,8 +2009,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 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 -- cgit v1.2.3