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 --- .../patches/120-strip-unsafe-dirs-for-relinking.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch') 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"' -- cgit v1.2.3