diff mbox series

[1/2] automake: 1.17 -> 1.18

Message ID 186484bc29ea5b9bbefd86532a9a403050f46a50.1749092509.git.liezhi.yang@windriver.com
State New
Headers show
Series [1/2] automake: 1.17 -> 1.18 | expand

Commit Message

Robert Yang June 5, 2025, 3:02 a.m. UTC
From: Robert Yang <liezhi.yang@windriver.com>

* 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>
---
 ...report-error-when-the-path-of-Perl-c.patch | 27 +++++++++++--------
 .../{automake_1.17.bb => automake_1.18.bb}    |  2 +-
 2 files changed, 17 insertions(+), 12 deletions(-)
 rename meta/recipes-devtools/automake/{automake_1.17.bb => automake_1.18.bb} (92%)

Comments

Richard Purdie June 6, 2025, 10:03 a.m. UTC | #1
On Wed, 2025-06-04 at 20:02 -0700, Robert Yang via lists.openembedded.org wrote:
> From: Robert Yang <liezhi.yang@windriver.com>
> 
> * 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>
> ---
>  ...report-error-when-the-path-of-Perl-c.patch | 27 +++++++++++--------
>  .../{automake_1.17.bb => automake_1.18.bb}    |  2 +-
>  2 files changed, 17 insertions(+), 12 deletions(-)
>  rename meta/recipes-devtools/automake/{automake_1.17.bb => automake_1.18.bb} (92%)
> 
> 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
> index 5a38feb16c..fd6d8affaa 100644
> --- 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
> @@ -13,22 +13,27 @@ Upstream-Status: Inappropriate [ oe-specific ]
>  
>  Signed-off-by: Changqing Li <changqing.li@windriver.com>
>  ---
> - configure | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> + configure |   10 ----------
> + 1 file changed, 10 deletions(-)
>  
>  diff --git a/configure b/configure
> -index 45bf85a..68d3c7d 100755
> +index 64b61eb..786aefd 100755
>  --- a/configure
>  +++ b/configure
> -@@ -3514,7 +3514,7 @@ case $PERL in
> +@@ -3776,16 +3776,6 @@ case $PERL in
>      as_fn_error $? "perl not found" "$LINENO" 5
>      ;;
>    *' '* | *'	'*)
> --  as_fn_error $? "The path to your Perl contains spaces or tabs.
> -+  : as_fn_error $? "The path to your Perl contains spaces or tabs.
> - This would cause build failures later or unusable programs.
> - Please use a path without spaces and try again." "$LINENO" 5
> +-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The path to your Perl contains spaces or tabs.
> +-This will likely cause build failures later or unusable programs.
> +-Unless you're specifying a full string for a #! line,
> +-as in \"/usr/bin/env perl\",
> +-please use a path without spaces and try again." >&5
> +-printf "%s\n" "$as_me: WARNING: The path to your Perl contains spaces or tabs.
> +-This will likely cause build failures later or unusable programs.
> +-Unless you're specifying a full string for a #! line,
> +-as in \"/usr/bin/env perl\",
> +-please use a path without spaces and try again." >&2;}
>     ;;
> --- 
> -2.25.1
> -
> + esac
> + 
> diff --git a/meta/recipes-devtools/automake/automake_1.17.bb b/meta/recipes-devtools/automake/automake_1.18.bb
> similarity index 92%
> rename from meta/recipes-devtools/automake/automake_1.17.bb
> rename to meta/recipes-devtools/automake/automake_1.18.bb
> index 4cda04e47b..9179268c7a 100644
> --- a/meta/recipes-devtools/automake/automake_1.17.bb
> +++ b/meta/recipes-devtools/automake/automake_1.18.bb
> @@ -25,7 +25,7 @@ SRC_URI += "\
>             file://0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch \
>             "
>  
> -SRC_URI[sha256sum] = "397767d4db3018dd4440825b60c64258b636eaf6bf99ac8b0897f06c89310acd"
> +SRC_URI[sha256sum] = "af6043a5d4b3beef0c48161f4a6936259321cd101a34c1ab0768328515626c8a"
>  
>  PERL = "${USRBINPATH}/perl"
>  PERL:class-native = "${USRBINPATH}/env perl"

I think, but am not 100% sure, this resulted in:

https://autobuilder.yoctoproject.org/valkyrie/#/builders/17/builds/1630

That build has documentation in DISTRO_FEATURES.

Cheers,

Richard
Ross Burton June 6, 2025, 10:44 a.m. UTC | #2
On 5 Jun 2025, at 04:02, Robert Yang via lists.openembedded.org <liezhi.yang=windriver.com@lists.openembedded.org> wrote:
> 
> From: Robert Yang <liezhi.yang@windriver.com>
> 
> * 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.
> 

This patch can be dropped.

Also this introduces a change which breaks libcheck.

I’m still slightly dubious that this upgrade is behaving correctly on rebuilds of existing source trees (see my long discussion on the automake list), which is why I posted earlier that I have patches but am testing still.  As the failures are on rebuilds the autobuilder will never see them.

Ross
diff mbox series

Patch

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
index 5a38feb16c..fd6d8affaa 100644
--- 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
@@ -13,22 +13,27 @@  Upstream-Status: Inappropriate [ oe-specific ]
 
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
 ---
- configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ configure |   10 ----------
+ 1 file changed, 10 deletions(-)
 
 diff --git a/configure b/configure
-index 45bf85a..68d3c7d 100755
+index 64b61eb..786aefd 100755
 --- a/configure
 +++ b/configure
-@@ -3514,7 +3514,7 @@ case $PERL in
+@@ -3776,16 +3776,6 @@ case $PERL in
     as_fn_error $? "perl not found" "$LINENO" 5
     ;;
   *' '* | *'	'*)
--  as_fn_error $? "The path to your Perl contains spaces or tabs.
-+  : as_fn_error $? "The path to your Perl contains spaces or tabs.
- This would cause build failures later or unusable programs.
- Please use a path without spaces and try again." "$LINENO" 5
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The path to your Perl contains spaces or tabs.
+-This will likely cause build failures later or unusable programs.
+-Unless you're specifying a full string for a #! line,
+-as in \"/usr/bin/env perl\",
+-please use a path without spaces and try again." >&5
+-printf "%s\n" "$as_me: WARNING: The path to your Perl contains spaces or tabs.
+-This will likely cause build failures later or unusable programs.
+-Unless you're specifying a full string for a #! line,
+-as in \"/usr/bin/env perl\",
+-please use a path without spaces and try again." >&2;}
    ;;
--- 
-2.25.1
-
+ esac
+ 
diff --git a/meta/recipes-devtools/automake/automake_1.17.bb b/meta/recipes-devtools/automake/automake_1.18.bb
similarity index 92%
rename from meta/recipes-devtools/automake/automake_1.17.bb
rename to meta/recipes-devtools/automake/automake_1.18.bb
index 4cda04e47b..9179268c7a 100644
--- a/meta/recipes-devtools/automake/automake_1.17.bb
+++ b/meta/recipes-devtools/automake/automake_1.18.bb
@@ -25,7 +25,7 @@  SRC_URI += "\
            file://0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch \
            "
 
-SRC_URI[sha256sum] = "397767d4db3018dd4440825b60c64258b636eaf6bf99ac8b0897f06c89310acd"
+SRC_URI[sha256sum] = "af6043a5d4b3beef0c48161f4a6936259321cd101a34c1ab0768328515626c8a"
 
 PERL = "${USRBINPATH}/perl"
 PERL:class-native = "${USRBINPATH}/env perl"