From 05080b48a9607e19a251c7396c1b06f08d98ed3b Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 15 Jan 2025 16:33:18 +0000 Subject: [PATCH] autoconf: rename autotools_aclocals and only run in do_configure Despite the name, autotools_aclocals() doesn't actually do anything with aclocal. Instead it reads all of the available autoconf site default files[1] and sets CONFIG_SITE appropriately. Rename the function to autotools_sitefiles to make this clear. Also there's no need to do this before do_configure or do_install, as the variable is only checked when configure runs. [1] https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Site-Defaults.html Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes-recipe/autotools.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/classes-recipe/autotools.bbclass b/meta/classes-recipe/autotools.bbclass index 99d3cb7583..b1829e83e2 100644 --- a/meta/classes-recipe/autotools.bbclass +++ b/meta/classes-recipe/autotools.bbclass @@ -134,12 +134,11 @@ EXTRACONFFUNCS ??= "" EXTRA_OECONF:append = " ${PACKAGECONFIG_CONFARGS}" -do_configure[prefuncs] += "autotools_preconfigure autotools_aclocals ${EXTRACONFFUNCS}" -do_compile[prefuncs] += "autotools_aclocals" -do_install[prefuncs] += "autotools_aclocals" +do_configure[prefuncs] += "autotools_preconfigure autotools_sitefiles ${EXTRACONFFUNCS}" do_configure[postfuncs] += "autotools_postconfigure" -python autotools_aclocals () { +# Tell autoconf to load the site defaults from siteinfo +python autotools_sitefiles () { sitefiles, searched = siteinfo_get_files(d, sysrootcache=True) d.setVar("CONFIG_SITE", " ".join(sitefiles)) } -- 2.47.2