aboutsummaryrefslogtreecommitdiffstats
path: root/tools/libtool/patches/150-trailingslash.patch
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-12-21 22:37:54 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-12-21 22:37:54 +0000
commitc4ab5ca14370406cdccaff868b2e655a2f21aa72 (patch)
treefe4b10d38dab0bd087dd41002537b2d49b48fed1 /tools/libtool/patches/150-trailingslash.patch
parente010aa6408573009e03a0dc86769b62712fad106 (diff)
downloadupstream-c4ab5ca14370406cdccaff868b2e655a2f21aa72.tar.gz
upstream-c4ab5ca14370406cdccaff868b2e655a2f21aa72.tar.bz2
upstream-c4ab5ca14370406cdccaff868b2e655a2f21aa72.zip
libtool: extend all ltmain.m4sh patches to cover ltmain.sh as well, prevent configure from embedding host library paths
SVN-Revision: 24752
Diffstat (limited to 'tools/libtool/patches/150-trailingslash.patch')
-rw-r--r--tools/libtool/patches/150-trailingslash.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/tools/libtool/patches/150-trailingslash.patch b/tools/libtool/patches/150-trailingslash.patch
index 14aa27be86..a01f9be77b 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