| From 012e670f8fb6d4c6c196c91909c95358ca9f6289 Mon Sep 17 00:00:00 2001 |
| From: Richard Purdie <richard.purdie@linuxfoundation.org> |
| Date: Wed, 5 Feb 2020 23:54:02 +0000 |
| Subject: [PATCH] Fixes to make the perl build reproducible: |
| |
| a) Remove the \n from configure_attr.sh since it gets quoted differently depending on |
| whether the shell is bash or dash which can cause the test result to be incorrect. |
| Reported upstream: https://github.com/arsv/perl-cross/issues/87 |
| |
| b) Sort the order of the module lists from configure_mods.sh since otherwise |
| the result isn't the same leading to makefile differences. |
| Reported upstream: https://github.com/arsv/perl-cross/issues/88 |
| |
| c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst |
| there for good measure) |
| Submitted to upstream perl: https://github.com/dankogai/p5-encode/pull/179 |
| |
| d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash |
| and "" with dash |
| Reported upstream: https://github.com/arsv/perl-cross/issues/87 |
| |
| RP 2020/2/7 |
| |
| Upstream-Status: Submitted [see links above] |
| Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org |
| --- |
| cpan/Encode/Byte/Makefile.PL | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/cpan/Encode/Byte/Makefile.PL b/cpan/Encode/Byte/Makefile.PL |
| index 6824bbb..4af4a50 100644 |
| --- a/cpan/Encode/Byte/Makefile.PL |
| +++ b/cpan/Encode/Byte/Makefile.PL |
| @@ -171,7 +171,7 @@ sub postamble |
| my $lengthsofar = length($str); |
| my $continuator = ''; |
| $str .= "$table.c : $enc2xs Makefile.PL"; |
| - foreach my $file (@{$tables{$table}}) |
| + foreach my $file (sort (@{$tables{$table}})) |
| { |
| $str .= $continuator.' '.$self->catfile($dir,$file); |
| if ( length($str)-$lengthsofar > 128*$numlines ) |
| @@ -189,7 +189,7 @@ sub postamble |
| qq{\n\t\$(PERL) $plib $enc2xs $ucopts -o \$\@ -f $table.fnm\n\n}; |
| open (FILELIST, ">$table.fnm") |
| || die "Could not open $table.fnm: $!"; |
| - foreach my $file (@{$tables{$table}}) |
| + foreach my $file (sort (@{$tables{$table}})) |
| { |
| print FILELIST $self->catfile($dir,$file) . "\n"; |
| } |