diff options
Diffstat (limited to 'meta/recipes-devtools/perl-cross/files')
3 files changed, 6 insertions, 60 deletions
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 8c8f3b717c..4e9153ebf1 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 24a3e0c48f9ebe473b5f1078663e275c27d0537f Mon Sep 17 00:00:00 2001 +From 3eb33dce6e3c93e1b3efcc9649f871100adada30 Mon Sep 17 00:00:00 2001 From: Mingli Yu <mingli.yu@windriver.com> Date: Fri, 2 Jul 2021 09:08:21 +0000 Subject: [PATCH] Makefile: check the file if patched or not @@ -9,23 +9,21 @@ one time. Upstream-Status: Inappropriate (OE-specific) Signed-off-by: Mingli Yu <mingli.yu@windriver.com> + --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index f4a26f5..7bc748e 100644 +index c6d6042..d137976 100644 --- a/Makefile +++ b/Makefile -@@ -61,7 +61,7 @@ miniperlmain$O: $(CROSSPATCHED) +@@ -67,7 +67,7 @@ miniperlmain$O: $(CROSSPATCHED) # Original versions are not saved anymore; patch generally takes care of this, # and if that fails, reaching for the source tarball is the safest option. $(CROSSPATCHED): %.applied: %.patch -- patch -p1 -i $< && touch $@ -+ test ! -f $@ && (patch -p1 -i $< && touch $@) || echo "$@ exist" +- $(cpatch) -p1 -i $< && touch $@ ++ test ! -f $@ && ($(cpatch) -p1 -i $< && touch $@) || echo "$@ exist" # ---[ common ]----------------------------------------------------------------- --- -2.29.2 - diff --git a/meta/recipes-devtools/perl-cross/files/0001-Makefile-correctly-list-modules-when-cleaning-them.patch b/meta/recipes-devtools/perl-cross/files/0001-Makefile-correctly-list-modules-when-cleaning-them.patch deleted file mode 100644 index 80388fa9b0..0000000000 --- a/meta/recipes-devtools/perl-cross/files/0001-Makefile-correctly-list-modules-when-cleaning-them.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 7b8d819e012c24df228a313beb86e1942611c904 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Sat, 4 Jun 2022 13:00:12 +0200 -Subject: [PATCH] Makefile: correctly list modules when cleaning them - -Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/133] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 6b35fb0..9ef9324 100644 ---- a/Makefile -+++ b/Makefile -@@ -462,7 +462,7 @@ clean-subdirs: - - # assuming modules w/o Makefiles were never built and need no cleaning - clean-modules: config.h -- @for i in $(modules disabled); do \ -+ @for i in $(modules) $(disabled); do \ - test -f $$i/Makefile && \ - touch $$i/Makefile && \ - $(MAKE) -C $$i clean \ diff --git a/meta/recipes-devtools/perl-cross/files/0001-Makefile-do-not-clean-config.h-xconfig.h.patch b/meta/recipes-devtools/perl-cross/files/0001-Makefile-do-not-clean-config.h-xconfig.h.patch deleted file mode 100644 index cbb935c71b..0000000000 --- a/meta/recipes-devtools/perl-cross/files/0001-Makefile-do-not-clean-config.h-xconfig.h.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ade4a70308d3b9d79cc3db841c0f60385780fe1a Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Sat, 4 Jun 2022 13:45:20 +0200 -Subject: [PATCH] Makefile: do not clean config.h/xconfig.h - -These are generated by ./configure and not by make. - -Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/134] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 9ef9324..3de2c2e 100644 ---- a/Makefile -+++ b/Makefile -@@ -473,7 +473,6 @@ clean-generated-files: - -rm -f uudmap.h opmini.c generate_uudmap$X bitcount.h $(CONFIGPM) - -rm -f git_version.h lib/re.pm lib/Config_git.pl - -rm -f perlmini.c perlmain.c -- -rm -f config.h xconfig.h - -rm -f pod/perlmodlib.pod - -rm -f ext.libs static.list - -rm -f $(patsubst %,%/ppport.h,$(mkppport_lst)) --- -2.30.2 - |