summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-18 17:27:26 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-18 23:53:55 +0000
commitcf8169a5f74d6e148e7fa6ee703c0b90103b90c8 (patch)
tree33e8863c349d82af93adc3eba4cae292da1eb866
parentd40869bbfda2b02b9d1b7d1f5e2ba14b0adb8e80 (diff)
downloadpoky-cf8169a5f74d6e148e7fa6ee703c0b90103b90c8.tar.gz
perl: Fix encode module reproducibility issues
The code is encoding host compiler parameters into target builds. Avoid this for our target builds. This should resolve builds which aren't reproducible between hosts with different compilers. (From OE-Core rev: 71cdbf426e46e3ca1b5038f40e9f7ba958abc537) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/perl/files/encodefix.patch20
-rw-r--r--meta/recipes-devtools/perl/perl_5.30.1.bb3
2 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/files/encodefix.patch b/meta/recipes-devtools/perl/files/encodefix.patch
new file mode 100644
index 0000000000..396ed0d53e
--- /dev/null
+++ b/meta/recipes-devtools/perl/files/encodefix.patch
@@ -0,0 +1,20 @@
1The code is encoding host compiler parameters into target builds. Avoid
2this for our target builds (patch is target specific, not native)
3
4Upstream-Status: Inappropriate [Cross compile hack]
5RP 2020/2/18
6Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
7
8Index: perl-5.30.1/cpan/Encode/bin/enc2xs
9===================================================================
10--- perl-5.30.1.orig/cpan/Encode/bin/enc2xs
11+++ perl-5.30.1/cpan/Encode/bin/enc2xs
12@@ -195,7 +195,7 @@ sub compiler_info {
13 # above becomes false.
14 my $sized = $declaration && !($compat && !$pedantic);
15
16- return ($cpp, $static, $sized);
17+ return (0, 1, 1);
18 }
19
20
diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb
index 5d762710df..b37f175f97 100644
--- a/meta/recipes-devtools/perl/perl_5.30.1.bb
+++ b/meta/recipes-devtools/perl/perl_5.30.1.bb
@@ -26,6 +26,9 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \
26SRC_URI_append_class-native = " \ 26SRC_URI_append_class-native = " \
27 file://perl-configpm-switch.patch \ 27 file://perl-configpm-switch.patch \
28" 28"
29SRC_URI_append_class-target = " \
30 file://encodefix.patch \
31"
29 32
30SRC_URI[perl.md5sum] = "6438eb7b8db9bbde28e01086de376a46" 33SRC_URI[perl.md5sum] = "6438eb7b8db9bbde28e01086de376a46"
31SRC_URI[perl.sha256sum] = "bf3d25571ff1ee94186177c2cdef87867fd6a14aa5a84f0b1fb7bf798f42f964" 34SRC_URI[perl.sha256sum] = "bf3d25571ff1ee94186177c2cdef87867fd6a14aa5a84f0b1fb7bf798f42f964"