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 <peda@lysator.liu.se>

diff --git a/ChangeLog b/ChangeLog
index 4a65c9ee598cb0f1a886e5a6dc9117cf8a050892..bcbc44842c33cbf92c246ac3bac179a705f8f09f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-07  Peter Rosin  <peda@lysator.liu.se>
+
+       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  <Ralf.Wildenhues@gmx.de>
 
        Bump copyright years.

diff --git a/THANKS b/THANKS
index 637decfbbe5a1361009ed011659f4e0f4b702cc1..6b86c5d766b07fff9a575ad0e326e25ced9e4fa2 100644 (file)
--- 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 336d97b8f80571c7ea0aceed35ebf21f738d56c4..d9e1cd25050719462d2997e3ad51b1f3bce60e06 100644 (file)
--- 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 423939504342eb36b64c8e868f740307b49e520e..c14475504895d486350a922b157992419c54e0ea 100644 (file)
--- 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