mirror of
https://git.yoctoproject.org/poky
synced 2026-02-21 17:09:42 +01:00
76e5603fb7
(From OE-Core rev: 35675cd8104151d23b2a64cd5093939fa3d2b8ea) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 5c00500618fa50eeb5e3e956e1fb5f4af562c1a7) Signed-off-by: Steve Sakoman <steve@sakoman.com>
46 lines
1.9 KiB
Diff
46 lines
1.9 KiB
Diff
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
|
|
|
|
Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL
|
|
===================================================================
|
|
--- perl-5.30.1.orig/cpan/Encode/Byte/Makefile.PL
|
|
+++ perl-5.30.1/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";
|
|
}
|