From c4ab5ca14370406cdccaff868b2e655a2f21aa72 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 21 Dec 2010 22:37:54 +0000 Subject: libtool: extend all ltmain.m4sh patches to cover ltmain.sh as well, prevent configure from embedding host library paths SVN-Revision: 24752 --- tools/libtool/patches/150-trailingslash.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'tools/libtool/patches/150-trailingslash.patch') 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 # 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 -- cgit v1.2.3