diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-21 22:37:54 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-21 22:37:54 +0000 |
| commit | 88e4479ac182b2d0b4b3541b6e9f7b5d0748b973 (patch) | |
| tree | 0cfb05ad7953f2503d7a0c50cc17081b918d19b8 /tools/libtool/patches/150-trailingslash.patch | |
| parent | d4042e2fe267d1eef3cdb3e6f0cb47432aa99665 (diff) | |
[tools] libtool: extend all ltmain.m4sh patches to cover ltmain.sh as well, prevent configure from embedding host library paths
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24752 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/libtool/patches/150-trailingslash.patch')
| -rw-r--r-- | tools/libtool/patches/150-trailingslash.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/tools/libtool/patches/150-trailingslash.patch b/tools/libtool/patches/150-trailingslash.patch index 14aa27be8..a01f9be77 100644 --- a/tools/libtool/patches/150-trailingslash.patch +++ b/tools/libtool/patches/150-trailingslash.patch @@ -28,3 +28,22 @@ Nitin A Kamble <nitin.a.kamble@intel.com> # Don't allow the user to place us outside of our expected # location b/c this prevents finding dependent libraries that +--- a/libltdl/config/ltmain.sh ++++ b/libltdl/config/ltmain.sh +@@ -2953,8 +2953,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 |