Skip to content

Commit 1bca1b4

Browse files
robertlinuxrpurdie
authored andcommitted
automake: 1.17 -> 1.18
* Rebased 0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch The previous patch added a ':' before the line to make it not run, but now there are multiple lines, so just remove them. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
1 parent 902cb38 commit 1bca1b4

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

meta/recipes-devtools/automake/automake/0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,27 @@ Upstream-Status: Inappropriate [ oe-specific ]
1313

1414
Signed-off-by: Changqing Li <changqing.li@windriver.com>
1515
---
16-
configure | 2 +-
17-
1 file changed, 1 insertion(+), 1 deletion(-)
16+
configure | 10 ----------
17+
1 file changed, 10 deletions(-)
1818

1919
diff --git a/configure b/configure
20-
index 45bf85a..68d3c7d 100755
20+
index 64b61eb..786aefd 100755
2121
--- a/configure
2222
+++ b/configure
23-
@@ -3514,7 +3514,7 @@ case $PERL in
23+
@@ -3776,16 +3776,6 @@ case $PERL in
2424
as_fn_error $? "perl not found" "$LINENO" 5
2525
;;
2626
*' '* | *' '*)
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
27+
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The path to your Perl contains spaces or tabs.
28+
-This will likely cause build failures later or unusable programs.
29+
-Unless you're specifying a full string for a #! line,
30+
-as in \"/usr/bin/env perl\",
31+
-please use a path without spaces and try again." >&5
32+
-printf "%s\n" "$as_me: WARNING: The path to your Perl contains spaces or tabs.
33+
-This will likely cause build failures later or unusable programs.
34+
-Unless you're specifying a full string for a #! line,
35+
-as in \"/usr/bin/env perl\",
36+
-please use a path without spaces and try again." >&2;}
3137
;;
32-
--
33-
2.25.1
34-
38+
esac
39+

meta/recipes-devtools/automake/automake_1.17.bb renamed to meta/recipes-devtools/automake/automake_1.18.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ SRC_URI += "\
2525
file://0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch \
2626
"
2727

28-
SRC_URI[sha256sum] = "397767d4db3018dd4440825b60c64258b636eaf6bf99ac8b0897f06c89310acd"
28+
SRC_URI[sha256sum] = "af6043a5d4b3beef0c48161f4a6936259321cd101a34c1ab0768328515626c8a"
2929

3030
PERL = "${USRBINPATH}/perl"
3131
PERL:class-native = "${USRBINPATH}/env perl"

0 commit comments

Comments
 (0)