diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-06-01 14:49:54 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-06-02 11:57:49 +0100 |
| commit | 648290d5bf4d6ff50d3643bb7ad902dfc23aa702 (patch) | |
| tree | bd01a20f919c3ea0d924a4ba5334fba2cc7d4534 /meta/packages/libtool/libtool-2.2.6 | |
| parent | 420b1d848842cdf687b14e95f2c7f737d2745033 (diff) | |
| download | openembedded-core-648290d5bf4d6ff50d3643bb7ad902dfc23aa702.tar.gz openembedded-core-648290d5bf4d6ff50d3643bb7ad902dfc23aa702.tar.bz2 openembedded-core-648290d5bf4d6ff50d3643bb7ad902dfc23aa702.tar.xz openembedded-core-648290d5bf4d6ff50d3643bb7ad902dfc23aa702.zip | |
libtool: Make sure ltmain.sh is always regenerated. We can't just remove it since it has to be present to run configure
Diffstat (limited to 'meta/packages/libtool/libtool-2.2.6')
| -rw-r--r-- | meta/packages/libtool/libtool-2.2.6/trailingslash.patch | 18 |
1 files changed, 0 insertions, 18 deletions
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 |