From 4b41afeea632f33a490d75621e2c0d6bb2bb6aca Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 18 Feb 2020 17:27:26 +0000 Subject: 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. Signed-off-by: Richard Purdie (cherry picked from commit 71cdbf426e46e3ca1b5038f40e9f7ba958abc537) Signed-off-by: Armin Kuster --- meta/recipes-devtools/perl/files/encodefix.patch | 20 ++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 3 +++ 2 files changed, 23 insertions(+) create mode 100644 meta/recipes-devtools/perl/files/encodefix.patch 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 @@ +The code is encoding host compiler parameters into target builds. Avoid +this for our target builds (patch is target specific, not native) + +Upstream-Status: Inappropriate [Cross compile hack] +RP 2020/2/18 +Signed-off-by: Richard Purdie + +Index: perl-5.30.1/cpan/Encode/bin/enc2xs +=================================================================== +--- perl-5.30.1.orig/cpan/Encode/bin/enc2xs ++++ perl-5.30.1/cpan/Encode/bin/enc2xs +@@ -195,7 +195,7 @@ sub compiler_info { + # above becomes false. + my $sized = $declaration && !($compat && !$pedantic); + +- return ($cpp, $static, $sized); ++ return (0, 1, 1); + } + + diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 96f032648b..e3915a5044 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 \ SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ " +SRC_URI_append_class-target = " \ + file://encodefix.patch \ +" SRC_URI[perl.md5sum] = "6438eb7b8db9bbde28e01086de376a46" SRC_URI[perl.sha256sum] = "bf3d25571ff1ee94186177c2cdef87867fd6a14aa5a84f0b1fb7bf798f42f964" -- cgit 1.2.3-korg