diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-12-18 18:13:12 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-12-18 18:13:12 +0000 |
| commit | d04b7d59c8799a530418460ba797a436bab2ec14 (patch) | |
| tree | 603107f5b3bfddadd575d261a2e0fcaf3e6bf8bf /package/libtool/patches/150-trailingslash.patch | |
| parent | cc15824e853ef96f0fc1efbdb0e29231b96e142c (diff) | |
| download | upstream-d04b7d59c8799a530418460ba797a436bab2ec14.tar.gz upstream-d04b7d59c8799a530418460ba797a436bab2ec14.tar.bz2 upstream-d04b7d59c8799a530418460ba797a436bab2ec14.zip | |
libtool: remove patches, they don't apply to libltdl
SVN-Revision: 24675
Diffstat (limited to 'package/libtool/patches/150-trailingslash.patch')
| -rw-r--r-- | package/libtool/patches/150-trailingslash.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/package/libtool/patches/150-trailingslash.patch b/package/libtool/patches/150-trailingslash.patch deleted file mode 100644 index 14aa27be86..0000000000 --- a/package/libtool/patches/150-trailingslash.patch +++ /dev/null @@ -1,30 +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 - -Merged a patch received from Gary Thomas <gary@mlbassoc.com> - -Date: 2010/07/12 -Nitin A Kamble <nitin.a.kamble@intel.com> - ---- a/libltdl/config/ltmain.m4sh -+++ b/libltdl/config/ltmain.m4sh -@@ -2164,8 +2164,15 @@ func_mode_install () - func_append 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 |