From: Alexander Kanavin <[email protected]> Signed-off-by: Alexander Kanavin <[email protected]> --- ...ile-check-the-file-if-patched-or-not.patch | 3 +- ...oss-add-LDFLAGS-when-linking-libperl.patch | 9 ++-- .../perl-cross/files/determinism.patch | 41 +++++++++++-------- .../{perlcross_1.5.2.bb => perlcross_1.6.bb} | 2 +- 4 files changed, 29 insertions(+), 26 deletions(-) rename meta/recipes-devtools/perl-cross/{perlcross_1.5.2.bb => perlcross_1.6.bb} (92%)
diff --git a/meta/recipes-devtools/perl-cross/files/0001-Makefile-check-the-file-if-patched-or-not.patch b/meta/recipes-devtools/perl-cross/files/0001-Makefile-check-the-file-if-patched-or-not.patch index 4e9153ebf10..7efee733c67 100644 --- a/meta/recipes-devtools/perl-cross/files/0001-Makefile-check-the-file-if-patched-or-not.patch +++ b/meta/recipes-devtools/perl-cross/files/0001-Makefile-check-the-file-if-patched-or-not.patch @@ -1,4 +1,4 @@ -From 3eb33dce6e3c93e1b3efcc9649f871100adada30 Mon Sep 17 00:00:00 2001 +From d0292a4f91ca22f8919a0f13d8961f98743bdbf1 Mon Sep 17 00:00:00 2001 From: Mingli Yu <[email protected]> Date: Fri, 2 Jul 2021 09:08:21 +0000 Subject: [PATCH] Makefile: check the file if patched or not @@ -9,7 +9,6 @@ one time. Upstream-Status: Inappropriate (OE-specific) Signed-off-by: Mingli Yu <[email protected]> - --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/perl-cross/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch b/meta/recipes-devtools/perl-cross/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch index 6c3f08c4324..6d387fe66a0 100644 --- a/meta/recipes-devtools/perl-cross/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch +++ b/meta/recipes-devtools/perl-cross/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch @@ -1,4 +1,4 @@ -From f824cbec9ac8f113a4ae35d57bd18625d415a71b Mon Sep 17 00:00:00 2001 +From c4ebb6d11d690185f66a3f0a591f193fd6611122 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Tue, 27 Nov 2018 15:37:40 +0100 Subject: [PATCH] perl-cross: add LDFLAGS when linking libperl @@ -10,10 +10,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 01644cd..be811a7 100644 +index 4b80079..c6d6042 100644 --- a/Makefile +++ b/Makefile -@@ -180,7 +180,7 @@ endif +@@ -191,7 +191,7 @@ endif ifeq ($(useshrplib),true) $(LIBPERL): @@ -22,6 +22,3 @@ index 01644cd..be811a7 100644 else $(LIBPERL): $(AR) cru $@ $(filter %$o,$^) --- -2.17.1 - diff --git a/meta/recipes-devtools/perl-cross/files/determinism.patch b/meta/recipes-devtools/perl-cross/files/determinism.patch index e9bf752bcb6..29de36cbafb 100644 --- a/meta/recipes-devtools/perl-cross/files/determinism.patch +++ b/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 <[email protected]> +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 <[email protected] +--- + 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=. - diff --git a/meta/recipes-devtools/perl-cross/perlcross_1.5.2.bb b/meta/recipes-devtools/perl-cross/perlcross_1.6.bb similarity index 92% rename from meta/recipes-devtools/perl-cross/perlcross_1.5.2.bb rename to meta/recipes-devtools/perl-cross/perlcross_1.6.bb index 48bda7e4b6f..34d9236cabd 100644 --- a/meta/recipes-devtools/perl-cross/perlcross_1.5.2.bb +++ b/meta/recipes-devtools/perl-cross/perlcross_1.6.bb @@ -18,7 +18,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/perl-cross-${PV}.tar.gz;name=perl-c " GITHUB_BASE_URI = "https://github.com/arsv/perl-cross/releases/"; -SRC_URI[perl-cross.sha256sum] = "584dc54c48dca25e032b676a15bef377c1fed9de318b4fc140292a5dbf326e90" +SRC_URI[perl-cross.sha256sum] = "5abf198ee50ce9e69eb68fede68c87f65241caa744e4203e97490fa59b45ed69" S = "${WORKDIR}/perl-cross-${PV}" -- 2.39.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#203785): https://lists.openembedded.org/g/openembedded-core/message/203785 Mute This Topic: https://lists.openembedded.org/mt/108118411/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
