[SCM] GNU Libtool branch, sysroot, updated. v2.2.10-93-gb9accaa

[Paolo Bonzini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, sysroot has been updated
       via  b9accaaa3b3e4d3cc1a72d5366e5526b65819026 (commit)
      from  d32c96ccd6dacf2c60504a6b847e3d82400adfac (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b9accaaa3b3e4d3cc1a72d5366e5526b65819026
Author: Paolo Bonzini <address@hidden>
Date:   Sun Aug 15 18:54:02 2010 +0200

    improve code for sysroot --mode=finish
    
    * libltdl/config/ltmain.m4sh (func_mode_finish): Change sysroot_regex
    and sysroot_cmd delimiter from pipe to slash.  Wrap the entire for
    loop with "if $opt_dry_run...fi" and print an explanatory message
    for the --dry-run case.

-----------------------------------------------------------------------

Summary of changes:
 libltdl/config/ltmain.m4sh |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index d29fd5d..4e922ac 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -1419,24 +1419,27 @@ func_mode_finish ()
     done
 
     if test -n "$libs"; then
-      tmpdir=`func_mktempdir`
       if test -n "$lt_sysroot"; then
-        sysroot_regex=`$ECHO "$lt_sysroot" | $SED 's/[].[^$\\*|]/\\\\&/g'`
-        sysroot_cmd="s|\([ ']\)$sysroot_regex|\1|g;"
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED 's/[].[^$\\*/]/\\\\&/g'`
+        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
       else
         sysroot_cmd=
       fi
 
       # Remove sysroot references
-      for lib in $libs; do
-       $opt_dry_run || {
+      if $opt_dry_run; then
+        tmpdir=`func_mktempdir`
+        for lib in $libs; do
          sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
            > $tmpdir/tmp-la
          mv -f $tmpdir/tmp-la $lib
-       }
-       file="$outputname"
-      done
-      $opt_dry_run || ${RM}r "$tmpdir"
+       done
+        ${RM}r "$tmpdir"
+      else
+        for lib in $libs; do
+          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+        done
+      fi
     fi
 
     if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then


hooks/post-receive
-- 
GNU Libtool