07-fyi-deterministic-cond3.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * automake.in (&variable_conditions): Be deterministic and Perl
        version independent: sort the result.
        (&variable_output, &variable_pretty_output): Sort all the @conds,
        not only when defaulted.
        * tests/cond3.test: Adjust.

Index: automake.in
--- automake.in Fri, 12 Oct 2001 14:43:57 +0200 akim
+++ automake.in Sat, 13 Oct 2001 20:49:06 +0200 akim
@@ -5970,7 +5970,7 @@ sub variable_conditions ($)
 {
     my ($var) = @_;
     my @conds = keys %{$var_value{$var}};
-    return @conds;
+    return sort by_condition @conds;
 }


@@ -6412,13 +6412,13 @@ sub variable_output ($@)
 {
   my ($var, @conds) = @_;

-  @conds = sort by_condition keys %{$var_value{$var}}
+  @conds = keys %{$var_value{$var}}
     unless @conds;

   $output_vars .= $var_comment{$var}
     if defined $var_comment{$var};

-  foreach my $cond (@conds)
+  foreach my $cond (sort by_condition @conds)
     {
       my $val = $var_value{$var}{$cond};
       my $equals = $var_type{$var} eq ':' ? ':=' : '=';
@@ -6437,13 +6437,13 @@ sub variable_pretty_output ($@)
 {
   my ($var, @conds) = @_;

-  @conds = sort by_condition keys %{$var_value{$var}}
+  @conds = keys %{$var_value{$var}}
     unless @conds;

   $output_vars .= $var_comment{$var}
     if defined $var_comment{$var};

-  foreach my $cond (@conds)
+  foreach my $cond (sort by_condition @conds)
     {
       my $val = $var_value{$var}{$cond};
       my $equals = $var_type{$var} eq ':' ? ':=' : '=';
Index: tests/cond3.test
--- tests/cond3.test Fri, 28 Sep 2001 09:30:37 +0200 akim
+++ tests/cond3.test Sat, 13 Oct 2001 20:48:28 +0200 akim
@@ -54,10 +54,10 @@
 }' Makefile.in >produced

 cat >expected << 'EOF'
address@hidden@am__objects_1 =
 @address@hidden = one.$(OBJEXT)
address@hidden@am__objects_2 =
address@hidden@am__objects_1 =
 @address@hidden = two.$(OBJEXT)
address@hidden@am__objects_2 =
 @address@hidden = three.$(OBJEXT)
 @address@hidden =
 am_targ_OBJECTS = $(am__objects_1) $(am__objects_2) $(am__objects_3)