diff options
author | Joshua Watt <jpewhacker@gmail.com> | 2019-06-21 08:30:30 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-24 10:36:28 +0100 |
commit | 08be264c8d132dc1d6f7e6ed0df57d269699edc8 (patch) | |
tree | 4fbcf2b485c27fafe1b35581f714d857bb953c26 /meta/recipes-devtools/perl/files | |
parent | 10ce84dd195cb1f2bfcc48dc07ed1019e30ec68e (diff) | |
download | poky-08be264c8d132dc1d6f7e6ed0df57d269699edc8.tar.gz |
perl: Reproducible build fixes
Applies two patches that are required to improve the reproducibility of
builds.
(From OE-Core rev: 9297cabb0aca8212d3cc74f8d26e43abc02ded87)
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/files')
-rw-r--r-- | meta/recipes-devtools/perl/files/0001-enc2xs-Add-environment-variable-to-suppress-comments.patch | 30 | ||||
-rw-r--r-- | meta/recipes-devtools/perl/files/0002-Constant-Fix-up-shebang.patch | 32 |
2 files changed, 62 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/files/0001-enc2xs-Add-environment-variable-to-suppress-comments.patch b/meta/recipes-devtools/perl/files/0001-enc2xs-Add-environment-variable-to-suppress-comments.patch new file mode 100644 index 0000000000..07f153162b --- /dev/null +++ b/meta/recipes-devtools/perl/files/0001-enc2xs-Add-environment-variable-to-suppress-comments.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 31a2c5555f9ef32f35d7d5ce1fd09a010ba5f5c6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Joshua Watt <JPEWhacker@gmail.com> | ||
3 | Date: Mon, 17 Jun 2019 10:47:15 -0500 | ||
4 | Subject: [PATCH 1/2] enc2xs: Add environment variable to suppress comments | ||
5 | |||
6 | Comment generation in enc2xs can now be suppressed by setting the | ||
7 | ENC2XS_NO_COMMENTS environment variable. This allows enc2xs to produce | ||
8 | reproducible output by omitting the name of the generating program. | ||
9 | |||
10 | Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> | ||
11 | Upstream-status: Accepted [https://github.com/dankogai/p5-encode/pull/145] | ||
12 | --- | ||
13 | cpan/Encode/bin/enc2xs | 1 + | ||
14 | 1 file changed, 1 insertion(+) | ||
15 | |||
16 | diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs | ||
17 | index 619b64b757..bfce9ee735 100644 | ||
18 | --- a/cpan/Encode/bin/enc2xs | ||
19 | +++ b/cpan/Encode/bin/enc2xs | ||
20 | @@ -144,6 +144,7 @@ getopts('CM:SQqOo:f:n:v',\%opt); | ||
21 | $opt{M} and make_makefile_pl($opt{M}, @ARGV); | ||
22 | $opt{C} and make_configlocal_pm($opt{C}, @ARGV); | ||
23 | $opt{v} ||= $ENV{ENC2XS_VERBOSE}; | ||
24 | +$opt{q} ||= $ENV{ENC2XS_NO_COMMENTS}; | ||
25 | |||
26 | sub verbose { | ||
27 | print STDERR @_ if $opt{v}; | ||
28 | -- | ||
29 | 2.21.0 | ||
30 | |||
diff --git a/meta/recipes-devtools/perl/files/0002-Constant-Fix-up-shebang.patch b/meta/recipes-devtools/perl/files/0002-Constant-Fix-up-shebang.patch new file mode 100644 index 0000000000..e70ff67f72 --- /dev/null +++ b/meta/recipes-devtools/perl/files/0002-Constant-Fix-up-shebang.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 260ebd15e16cd86b9b58e5c5f3a496b3853ca46d Mon Sep 17 00:00:00 2001 | ||
2 | From: Joshua Watt <JPEWhacker@gmail.com> | ||
3 | Date: Mon, 17 Jun 2019 10:47:23 -0500 | ||
4 | Subject: [PATCH 2/2] Constant: Fix up shebang | ||
5 | |||
6 | The instructions indicate that the script should be explicitly passed to | ||
7 | "perl -x", so automatically setting the #! to be ^X is unnecessary and | ||
8 | makes the file non-reproducible when building because ^X could be the | ||
9 | absolute path to miniperl. | ||
10 | |||
11 | Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> | ||
12 | Upstream-status: Submitted [https://rt.cpan.org/Public/Bug/Display.html?id=129866] | ||
13 | --- | ||
14 | cpan/ExtUtils-Constant/lib/ExtUtils/Constant/XS.pm | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/cpan/ExtUtils-Constant/lib/ExtUtils/Constant/XS.pm b/cpan/ExtUtils-Constant/lib/ExtUtils/Constant/XS.pm | ||
18 | index 14eb809714..d4d074e121 100644 | ||
19 | --- a/cpan/ExtUtils-Constant/lib/ExtUtils/Constant/XS.pm | ||
20 | +++ b/cpan/ExtUtils-Constant/lib/ExtUtils/Constant/XS.pm | ||
21 | @@ -219,7 +219,7 @@ sub dogfood { | ||
22 | Regenerate these constant functions by feeding this entire source file to | ||
23 | perl -x | ||
24 | |||
25 | -#!$^X -w | ||
26 | +#!/usr/bin/env perl -x -w | ||
27 | use ExtUtils::Constant qw (constant_types C_constant XS_constant); | ||
28 | |||
29 | EOT | ||
30 | -- | ||
31 | 2.21.0 | ||
32 | |||