qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

[tools] libtool: extend all ltmain.m4sh patches to cover ltmain.sh as well, prevent configure from embedding host library paths

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24752 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow
2010-12-21 22:37:54 +00:00
parent d4042e2fe2
commit 88e4479ac1
5 changed files with 96 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tools/libtool/patches/150-trailingslash.patch
View File

@@ -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