aboutsummaryrefslogtreecommitdiffstats
path: root/tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.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/120-strip-unsafe-dirs-for-relinking.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/120-strip-unsafe-dirs-for-relinking.patch')
-rw-r--r--tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch12
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"'