5a252f5
5a252f5
Generate the XS typemap files in sorted order; ensures that the
5a252f5
devel package contents do not differe across multilib platforms.
5a252f5
3fa4b6c
--- mod_perl-2.0.4/lib/ModPerl/TypeMap.pm.multilib
3fa4b6c
+++ mod_perl-2.0.4/lib/ModPerl/TypeMap.pm
3fa4b6c
@@ -442,12 +442,12 @@ sub typedefs_code {
5a252f5
         $code .= qq{\#include "$_"\n}
5a252f5
     }
5a252f5
 
5a252f5
-    for my $t (@{ $self->{struct} }) {
5a252f5
+    for my $t (sort {$a->[1] cmp $b->[1]} @{ $self->{struct} }) {
5a252f5
         next if $seen{ $t->[1] }++;
5a252f5
         $code .= "typedef $t->[0] * $t->[1];\n";
5a252f5
     }
5a252f5
 
5a252f5
-    for my $t (@{ $self->{typedef} }) {
5a252f5
+    for my $t (sort {$a->[1] cmp $b->[1]} @{ $self->{typedef} }) {
5a252f5
         next if $seen{ $t->[1] }++;
5a252f5
         $code .= "typedef $t->[0] $t->[1];\n";
5a252f5
     }
3fa4b6c
@@ -470,7 +470,9 @@ sub sv_convert_code {
5a252f5
     my %seen;
5a252f5
     my $code = "";
5a252f5
 
5a252f5
-    while (my ($ctype, $ptype) = each %$map) {
5a252f5
+    for my $ctype (sort keys %$map) {
5a252f5
+        my $ptype = $map->{$ctype};
5a252f5
+
5a252f5
         next if $self->special($ptype);
5a252f5
         next if $ctype =~ /\s/;
5a252f5
         my $class = $ptype;