From 002e03132b8ba1f1b254c8a63ff70db2a5d16518 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 8 Jan 2025 15:46:36 +0000 Subject: [PATCH] autotools: remove aclocal --automake-acdir, relocated so knows the right path A relocated aclocal in the native sysroot has the right paths already: $ cat /work/ross/build/tmp/work/cortexa57-poky-linux/expect/5.45.4/recipe-sysroot-native/usr/bin/aclocal my @automake_includes = ('/work/ross/build/tmp/work/cortexa57-poky-linux/expect/5.45.4/recipe-sysroot-native/usr/share/aclocal-' . $APIVERSION); Thus there is no need to tell aclocal the path explicitly. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes-recipe/autotools.bbclass | 6 ------ 1 file changed, 6 deletions(-) diff --git a/meta/classes-recipe/autotools.bbclass b/meta/classes-recipe/autotools.bbclass index 9e89ce40b9e..4e7bf6696d7 100644 --- a/meta/classes-recipe/autotools.bbclass +++ b/meta/classes-recipe/autotools.bbclass @@ -183,12 +183,6 @@ autotools_do_configure() { acpaths="${acpaths}" fi acpaths="$acpaths ${ACLOCALEXTRAPATH}" - AUTOV=`automake --version | sed -e '1{s/.* //;s/\.[0-9]\+$//};q'` - automake --version - echo "AUTOV is $AUTOV" - if [ -d ${STAGING_DATADIR_NATIVE}/aclocal-$AUTOV ]; then - ACLOCAL="$ACLOCAL --automake-acdir=${STAGING_DATADIR_NATIVE}/aclocal-$AUTOV" - fi # autoreconf is too shy to overwrite aclocal.m4 if it doesn't look # like it was auto-generated. Work around this by blowing it away # by hand, unless the package specifically asked not to run aclocal. -- 2.47.3