From ce87974b8e4315c296629578f9abd089fda60412 Mon Sep 17 00:00:00 2001 From: Peter Rosin Date: Fri, 7 Jan 2011 11:49:10 +0100 Subject: [PATCH] Convert file name to toolchain format when blessing archives. * libltdl/config/ltmain.m4sh (func_mode_install): When executing old_postinstall_cmds and old_archive_cmds, convert $oldlib to a format appropriate for the tool and provide that in $tool_oldlib. Also use $tool_oldlib when stripping old libraries. * libltdl/m4/libtool.m4 (_LT_CMD_OLD_ARCHIVE): Use $tool_oldlib as argument to $RANLIB. * THANKS: Update. Report by Dan McMahill. Signed-off-by: Peter Rosin --- ChangeLog | 12 ++++++++++++ THANKS | 1 + libltdl/config/ltmain.m4sh | 6 +++++- libltdl/m4/libtool.m4 | 6 +++--- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a65c9ee5..bcbc44842 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2011-01-07 Peter Rosin + + Convert file name to toolchain format when blessing archives. + * libltdl/config/ltmain.m4sh (func_mode_install): When executing + old_postinstall_cmds and old_archive_cmds, convert $oldlib to a + format appropriate for the tool and provide that in $tool_oldlib. + Also use $tool_oldlib when stripping old libraries. + * libltdl/m4/libtool.m4 (_LT_CMD_OLD_ARCHIVE): Use $tool_oldlib + as argument to $RANLIB. + * THANKS: Update. + Report by Dan McMahill. + 2011-01-02 Ralf Wildenhues Bump copyright years. diff --git a/THANKS b/THANKS index 637decfbb..6b86c5d76 100644 --- a/THANKS +++ b/THANKS @@ -88,6 +88,7 @@ Christopher Hulbert cchgroupmail@gmail.com Craig Tierney Craig.Tierney@noaa.gov Dalibor Topic robilad@kaffe.org + Dan McMahill mcmahill@mtl.mit.edu Daniel Reed n@ml.org Daniel Richard G. skunk@iSKUNK.ORG Dave Korn dave.korn.cygwin@googlemail.com diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index 336d97b8f..d9e1cd250 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -2412,11 +2412,13 @@ func_mode_install () # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -8370,6 +8372,8 @@ EOF esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index 423939504..c14475504 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -1448,13 +1448,13 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in -- 2.47.2