diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2010-12-21 22:37:54 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-12-21 22:37:54 +0000 |
commit | 8a05d522c6aba05c03f043007eea63e89e87ed72 (patch) | |
tree | 0cfb05ad7953f2503d7a0c50cc17081b918d19b8 /tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch | |
parent | 4ab08543360eace08f4c6d729713f17c87e92021 (diff) | |
download | upstream-8a05d522c6aba05c03f043007eea63e89e87ed72.tar.gz upstream-8a05d522c6aba05c03f043007eea63e89e87ed72.tar.bz2 upstream-8a05d522c6aba05c03f043007eea63e89e87ed72.zip |
[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/120-strip-unsafe-dirs-for-relinking.patch')
-rw-r--r-- | tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch b/tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch index 564d885a50..1c3df4c004 100644 --- a/tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch +++ b/tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch @@ -10,3 +10,15 @@ func_warning "relinking \`$file'" func_show_eval "$relink_command" \ 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' +--- a/libltdl/config/ltmain.sh ++++ b/libltdl/config/ltmain.sh +@@ -2972,6 +2972,9 @@ func_mode_install () + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` + fi + ++ relink_command=`$ECHO "$relink_command" | $SED "s%-L[[:space:]]*/lib[^[:space:]]*%%"` ++ relink_command=`$ECHO "$relink_command" | $SED "s%-L[[:space:]]*/usr/lib[^[:space:]]*%%"` ++ + func_warning "relinking \`$file'" + func_show_eval "$relink_command" \ + 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' |