mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-03 13:49:49 +00:00
Code Issues Projects Releases Wiki Activity

autotools: don't try and find in-tree macros

Browse Source 
autotools has improved a lot since this class was written, and there's
now no need to search the source tree for m4 files and add them to the
include path.

If packages have macros in subdirectories the idiom is to tell aclocal
via an assignment in Makefile.am:

  ACLOCAL_AMFLAGS = -I gl/m4 -I m4

If, for example, a package isn't autoreconfable out of the box (because
it has a non-trivial autogen.sh or similar, say) then the required -I
statements can be added to EXTRA_AUTORECONF.

(From OE-Core rev: e718d1be2c4fb54cf363c23f929358e1be68c724)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2025-02-25 14:26:33 +00:00
committed by Richard Purdie
parent 510a1fb72b
commit a4b1fa2b22
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes-recipe/autotools.bbclass
+2 -12
View File
@@ -36,7 +36,6 @@ inherit siteinfo
# the contents of the sysroot. # the contents of the sysroot.
export CONFIG_SITE export CONFIG_SITE
acpaths ?= "default"
EXTRA_AUTORECONF += "--exclude=autopoint" EXTRA_AUTORECONF += "--exclude=autopoint"
export lt_cv_sys_lib_dlsearch_path_spec = "${libdir} ${base_libdir}" export lt_cv_sys_lib_dlsearch_path_spec = "${libdir} ${base_libdir}"
@@ -167,15 +166,6 @@ autotools_do_configure() {
cd ${AUTOTOOLS_SCRIPT_PATH} cd ${AUTOTOOLS_SCRIPT_PATH}
# aclocal looks in the native sysroot by default, so tell it to also look in the target sysroot. # aclocal looks in the native sysroot by default, so tell it to also look in the target sysroot.
ACLOCAL="aclocal --aclocal-path=${STAGING_DATADIR}/aclocal/" ACLOCAL="aclocal --aclocal-path=${STAGING_DATADIR}/aclocal/"
if [ x"${acpaths}" = xdefault ]; then
acpaths=
for i in `find ${AUTOTOOLS_SCRIPT_PATH} -ignore_readdir_race -maxdepth 2 -name \*.m4|grep -v 'aclocal.m4'| \
grep -v 'acinclude.m4' | sed -e 's,\(.*/\).*$,\1,'|sort -u`; do
acpaths="$acpaths -I $i"
done
else
acpaths="${acpaths}"
fi
# autoreconf is too shy to overwrite aclocal.m4 if it doesn't look # 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 # like it was auto-generated. Work around this by blowing it away
# by hand, unless the package specifically asked not to run aclocal. # by hand, unless the package specifically asked not to run aclocal.
@@ -212,8 +202,8 @@ autotools_do_configure() {
find ${S} -ignore_readdir_race -name $i -delete find ${S} -ignore_readdir_race -name $i -delete
done done
bbnote Executing ACLOCAL=\"$ACLOCAL\" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths bbnote Executing ACLOCAL=\"$ACLOCAL\" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF}
ACLOCAL="$ACLOCAL" autoreconf -Wcross -Wno-obsolete --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || die "autoreconf execution failed." ACLOCAL="$ACLOCAL" autoreconf -Wcross -Wno-obsolete --verbose --install --force ${EXTRA_AUTORECONF} || die "autoreconf execution failed."
cd $olddir cd $olddir
fi fi
if [ -e ${CONFIGURE_SCRIPT} ]; then if [ -e ${CONFIGURE_SCRIPT} ]; then