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 new file mode 100644 index 0000000000..5a38feb16c --- /dev/null +++ b/meta/recipes-devtools/automake/automake/0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch @@ -0,0 +1,34 @@ +From 4339a2298a2d486fb4636b72393499b59805edde Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 21 Nov 2024 14:54:37 +0800 +Subject: [PATCH] configure: don't report error when the path of Perl contains + spaces or tabs + +In order to make setting PERL to "/usr/bin/env perl" works well, patch +configure as upstream suggested, refer [1]. + +[1] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=74453 + +Upstream-Status: Inappropriate [ oe-specific ] + +Signed-off-by: Changqing Li +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 45bf85a..68d3c7d 100755 +--- a/configure ++++ b/configure +@@ -3514,7 +3514,7 @@ 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 + ;; +-- +2.25.1 + diff --git a/meta/recipes-devtools/automake/automake_1.17.bb b/meta/recipes-devtools/automake/automake_1.17.bb index e22e51498b..1118aa4668 100644 --- a/meta/recipes-devtools/automake/automake_1.17.bb +++ b/meta/recipes-devtools/automake/automake_1.17.bb @@ -24,13 +24,19 @@ SRC_URI += "\ file://0003-build-fix-race-in-parallel-builds.patch \ file://0004-Add-a-new-distro-feature-ptest.patch \ file://0006-automake-Remove-delays-in-configure-scripts-using-au.patch \ + file://0001-configure-don-t-report-error-when-the-path-of-Perl-c.patch \ " SRC_URI[sha256sum] = "397767d4db3018dd4440825b60c64258b636eaf6bf99ac8b0897f06c89310acd" +PERL = "${USRBINPATH}/perl" +PERL:class-native = "${USRBINPATH}/env perl" +PERL:class-nativesdk = "${USRBINPATH}/env perl" + +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='${PERL}'" + do_install:append () { install -d ${D}${datadir} - sed -i -e 's@^#!.*perl$@#!/usr/bin/env perl@' ${D}/${bindir}/* } BBCLASSEXTEND = "native nativesdk"