summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2025-09-03 20:40:38 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-09-11 09:41:10 +0100
commit09c6c50b1d8dc5ef00455b9b6ece03da06183f22 (patch)
treefc0102641957f10666b167b6f7c099aad64c1cb3 /meta
parent66ed4bccd67f53412f4dc26a1037b99695e3fa3a (diff)
downloadpoky-09c6c50b1d8dc5ef00455b9b6ece03da06183f22.tar.gz
automake: 1.17 -> 1.18.1
* Drop 0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch, it is a warning not an error any more, so just drop it. (From OE-Core rev: 40144c6b24133eadec8f7b91ddbe8633e4082d5c) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/automake/automake/0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch34
-rw-r--r--meta/recipes-devtools/automake/automake_1.18.1.bb (renamed from meta/recipes-devtools/automake/automake_1.17.bb)3
2 files changed, 1 insertions, 36 deletions
diff --git a/meta/recipes-devtools/automake/automake/0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch b/meta/recipes-devtools/automake/automake/0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch
deleted file mode 100644
index 5a38feb16c..0000000000
--- a/meta/recipes-devtools/automake/automake/0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 4339a2298a2d486fb4636b72393499b59805edde Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 21 Nov 2024 14:54:37 +0800
4Subject: [PATCH] configure: don't report error when the path of Perl contains
5 spaces or tabs
6
7In order to make setting PERL to "/usr/bin/env perl" works well, patch
8configure as upstream suggested, refer [1].
9
10[1] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=74453
11
12Upstream-Status: Inappropriate [ oe-specific ]
13
14Signed-off-by: Changqing Li <changqing.li@windriver.com>
15---
16 configure | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/configure b/configure
20index 45bf85a..68d3c7d 100755
21--- a/configure
22+++ b/configure
23@@ -3514,7 +3514,7 @@ case $PERL in
24 as_fn_error $? "perl not found" "$LINENO" 5
25 ;;
26 *' '* | *' '*)
27- as_fn_error $? "The path to your Perl contains spaces or tabs.
28+ : as_fn_error $? "The path to your Perl contains spaces or tabs.
29 This would cause build failures later or unusable programs.
30 Please use a path without spaces and try again." "$LINENO" 5
31 ;;
32--
332.25.1
34
diff --git a/meta/recipes-devtools/automake/automake_1.17.bb b/meta/recipes-devtools/automake/automake_1.18.1.bb
index 4cda04e47b..4544f7d539 100644
--- a/meta/recipes-devtools/automake/automake_1.17.bb
+++ b/meta/recipes-devtools/automake/automake_1.18.1.bb
@@ -22,10 +22,9 @@ SRC_URI += "\
22 file://0002-automake-Update-for-python.m4-to-respect-libdir.patch \ 22 file://0002-automake-Update-for-python.m4-to-respect-libdir.patch \
23 file://0004-Add-a-new-distro-feature-ptest.patch \ 23 file://0004-Add-a-new-distro-feature-ptest.patch \
24 file://0006-automake-Remove-delays-in-configure-scripts-using-au.patch \ 24 file://0006-automake-Remove-delays-in-configure-scripts-using-au.patch \
25 file://0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch \
26 " 25 "
27 26
28SRC_URI[sha256sum] = "397767d4db3018dd4440825b60c64258b636eaf6bf99ac8b0897f06c89310acd" 27SRC_URI[sha256sum] = "63e585246d0fc8772dffdee0724f2f988146d1a3f1c756a3dc5cfbefa3c01915"
29 28
30PERL = "${USRBINPATH}/perl" 29PERL = "${USRBINPATH}/perl"
31PERL:class-native = "${USRBINPATH}/env perl" 30PERL:class-native = "${USRBINPATH}/env perl"