diff options
Diffstat (limited to 'poky/meta/recipes-devtools/perl-cross/files/determinism.patch')
-rw-r--r-- | poky/meta/recipes-devtools/perl-cross/files/determinism.patch | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/poky/meta/recipes-devtools/perl-cross/files/determinism.patch b/poky/meta/recipes-devtools/perl-cross/files/determinism.patch index e9bf752bcb..29de36cbaf 100644 --- a/poky/meta/recipes-devtools/perl-cross/files/determinism.patch +++ b/poky/meta/recipes-devtools/perl-cross/files/determinism.patch @@ -1,4 +1,7 @@ -Fixes to make the perl build reproducible: +From 8fd84d6d760b21bad2c499b572951cc3f2235953 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. @@ -8,7 +11,7 @@ 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 +c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst there for good measure) This needs to go to upstream perl (not done) @@ -20,12 +23,26 @@ RP 2020/2/7 Upstream-Status: Pending [75% submitted] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org +--- + cnf/configure | 2 +- + cnf/configure_mods.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) -Index: perl-5.30.1/cnf/configure_mods.sh -=================================================================== ---- perl-5.30.1.orig/cnf/configure_mods.sh -+++ perl-5.30.1/cnf/configure_mods.sh -@@ -82,7 +82,7 @@ extonlyif() { +diff --git a/cnf/configure b/cnf/configure +index 2f451c6..86bc865 100755 +--- a/cnf/configure ++++ b/cnf/configure +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + base=${0%/*}; test -z "$base" && base=. + +diff --git a/cnf/configure_mods.sh b/cnf/configure_mods.sh +index d4ef5a7..8e88b48 100644 +--- a/cnf/configure_mods.sh ++++ b/cnf/configure_mods.sh +@@ -108,7 +108,7 @@ extonlyif() { } definetrimspaces() { @@ -34,13 +51,3 @@ Index: perl-5.30.1/cnf/configure_mods.sh define $1 "$v" } -Index: perl-5.30.1/cnf/configure -=================================================================== ---- perl-5.30.1.orig/cnf/configure -+++ perl-5.30.1/cnf/configure -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - - base=${0%/*}; test -z "$base" && base=. - |