[SCM] GNU Libtool branch, master, updated. v2.2.6-194-g74c8993

[Ralf Wildenhues]

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, master has been updated
       via  74c8993c178a1386ea5e2363a01d919738402f30 (commit)
       via  7877d1d13f5f2f67b3d062603cb82791fc479257 (commit)
      from  f21029c498c2cf9f0481a203f91f538f0c290d58 (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 74c8993c178a1386ea5e2363a01d919738402f30
Author: Chris Demetriou <address@hidden>
Date:   Fri Mar 19 06:26:03 2010 +0100

    Sort output of 'find' to enable deterministic builds.
    
    * libltdl/config/ltmain.m4sh (func_extract_archives): Sort
    output of 'find'.
    * libltdl/m4/libtool.m4 (_LT_LANG_CXX_CONFIG): Likewise.
    * THANKS: Update.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 7877d1d13f5f2f67b3d062603cb82791fc479257
Author: Ralf Wildenhues <address@hidden>
Date:   Wed Mar 17 22:44:25 2010 +0100

    Unconditionally normalize LC_ALL, LANGUAGE in libtool script.
    
    * libltdl/config/ltmain.m4sh: Unconditionally set LC_ALL and
    LANGUAGE to 'C', to avoid semantic differences on MinGW under
    Chines locale.  SCO issues with e.g. LANG=C are not known to
    be relevant today any more.
    Report by Pete Batard <address@hidden> and Xiaofan Chen
    <address@hidden>.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog                  |   18 ++++++++++++++++++
 THANKS                     |    1 +
 libltdl/config/ltmain.m4sh |   10 +++++-----
 libltdl/m4/libtool.m4      |    8 ++++----
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5c36a74..744157f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2010-03-19  Chris Demetriou  <address@hidden>
+
+       Sort output of 'find' to enable deterministic builds.
+       * libltdl/config/ltmain.m4sh (func_extract_archives): Sort
+       output of 'find'.
+       * libltdl/m4/libtool.m4 (_LT_LANG_CXX_CONFIG): Likewise.
+       * THANKS: Update.
+
+2010-03-19  Ralf Wildenhues  <address@hidden>
+
+       Unconditionally normalize LC_ALL, LANGUAGE in libtool script.
+       * libltdl/config/ltmain.m4sh: Unconditionally set LC_ALL and
+       LANGUAGE to 'C', to avoid semantic differences on MinGW under
+       Chines locale.  SCO issues with e.g. LANG=C are not known to
+       be relevant today any more.
+       Report by Pete Batard <address@hidden> and Xiaofan Chen
+       <address@hidden>.
+
 2010-03-17  Peter Rosin  <address@hidden>
 
        Preserve the last error when restoring the error mode.
diff --git a/THANKS b/THANKS
index 7ff58a8..529a699 100644
--- a/THANKS
+++ b/THANKS
@@ -79,6 +79,7 @@
   Bruno Haible                 address@hidden
   Camilo La Rota               address@hidden
   Carl D. Roth                 address@hidden
+  Chris Demetriou              address@hidden
   Chris P. Ross                        address@hidden
   Christian Biesinger          address@hidden
   Christian Rössel            address@hidden
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 8fcedc9..435f1c4 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -106,9 +106,6 @@ _LTECHO_EOF'
 }
 
 # NLS nuisances: We save the old values to restore during execute mode.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
 lt_user_locale=
 lt_safe_locale=
 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
@@ -121,6 +118,9 @@ do
          lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
        fi"
 done
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
 
 $lt_unset CDPATH
 
@@ -2311,7 +2311,7 @@ func_extract_archives ()
            darwin_file=
            darwin_files=
            for darwin_file in $darwin_filelist; do
-             darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+             darwin_files=`find unfat-$$ -name $darwin_file -print | sort | 
$NL2SP`
              $LIPO -create -output "$darwin_file" $darwin_files
            done # $darwin_filelist
            $RM -rf unfat-$$
@@ -2326,7 +2326,7 @@ func_extract_archives ()
         func_extract_an_archive "$my_xdir" "$my_xabs"
        ;;
       esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name 
\*.lo -print | $NL2SP`
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name 
\*.lo -print | sort | $NL2SP`
     done
 
     func_extract_archives_result="$my_oldobjs"
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 677505d..d74038f 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -6001,20 +6001,20 @@ if test "$_lt_caught_CXX_error" != yes; then
              _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
                rm -rf $tpldir~
                $CC --prelink_objects --instantiation_dir $tpldir $objs 
$libobjs $compile_deplibs~
-               compile_command="$compile_command `find $tpldir -name \*.o | 
$NL2SP`"'
+               compile_command="$compile_command `find $tpldir -name \*.o | 
sort | $NL2SP`"'
              _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
                rm -rf $tpldir~
                $CC --prelink_objects --instantiation_dir $tpldir 
$oldobjs$old_deplibs~
-               $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name 
\*.o | $NL2SP`~
+               $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name 
\*.o | sort | $NL2SP`~
                $RANLIB $oldlib'
              _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
                rm -rf $tpldir~
                $CC --prelink_objects --instantiation_dir $tpldir 
$predep_objects $libobjs $deplibs $convenience $postdep_objects~
-               $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find 
$tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname 
${wl}$soname -o $lib'
+               $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find 
$tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags 
${wl}-soname ${wl}$soname -o $lib'
              _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
                rm -rf $tpldir~
                $CC --prelink_objects --instantiation_dir $tpldir 
$predep_objects $libobjs $deplibs $convenience $postdep_objects~
-               $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find 
$tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname 
${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+               $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find 
$tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags 
${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o 
$lib'
              ;;
            *) # Version 6 and above use weak symbols
              _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag 
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname 
${wl}$soname -o $lib'


hooks/post-receive
-- 
GNU Libtool