summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl-cross/files/determinism.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/perl-cross/files/determinism.patch')
-rw-r--r--meta/recipes-devtools/perl-cross/files/determinism.patch53
1 files changed, 0 insertions, 53 deletions
diff --git a/meta/recipes-devtools/perl-cross/files/determinism.patch b/meta/recipes-devtools/perl-cross/files/determinism.patch
deleted file mode 100644
index 71a405ab6b..0000000000
--- a/meta/recipes-devtools/perl-cross/files/determinism.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1From 8fd84d6d760b21bad2c499b572951cc3f2235953 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Wed, 5 Feb 2020 23:54:02 +0000
4Subject: [PATCH] Fixes to make the perl build reproducible:
5
6a) Remove the \n from configure_attr.sh since it gets quoted differently depending on
7 whether the shell is bash or dash which can cause the test result to be incorrect.
8 Reported upstream: https://github.com/arsv/perl-cross/issues/87
9
10b) Sort the order of the module lists from configure_mods.sh since otherwise
11 the result isn't the same leading to makefile differences.
12 Reported upstream: https://github.com/arsv/perl-cross/issues/88
13
14c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst
15 there for good measure)
16 This needs to go to upstream perl (not done)
17
18d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash
19 and "" with dash
20 Reported upstream: https://github.com/arsv/perl-cross/issues/87
21
22RP 2020/2/7
23
24Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/154 https://github.com/arsv/perl-cross/pull/155]
25Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org
26---
27 cnf/configure | 2 +-
28 cnf/configure_mods.sh | 2 +-
29 2 files changed, 2 insertions(+), 2 deletions(-)
30
31diff --git a/cnf/configure b/cnf/configure
32index 2f451c6..86bc865 100755
33--- a/cnf/configure
34+++ b/cnf/configure
35@@ -1,4 +1,4 @@
36-#!/bin/sh
37+#!/bin/bash
38
39 base=${0%/*}; test -z "$base" && base=.
40
41diff --git a/cnf/configure_mods.sh b/cnf/configure_mods.sh
42index d4ef5a7..8e88b48 100644
43--- a/cnf/configure_mods.sh
44+++ b/cnf/configure_mods.sh
45@@ -108,7 +108,7 @@ extonlyif() {
46 }
47
48 definetrimspaces() {
49- v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//'`
50+ v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//' | xargs -n1 | LANG=C sort | xargs`
51 define $1 "$v"
52 }
53