From 1744622831ed26c34c3ae3e0707c48b72c2f4e9c Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Wed, 14 Apr 2010 00:19:21 +0000 Subject: [PATCH] autotools.bbclass: swapped calls of intltoolize + autoreconf Because 'intltoolize' checks whether aclocal.m4 contains a recent copy of 'intltool.m4' and it will fail when the found version is too old, 'aclocal' must be called before 'intltoolize'. I built projects it with intltool-0.40.6-r3, autoconf-2.65-r9, automake-1.11.1-r3 and gettext-0.17-r6 successfully with this change but it will require probably tests with older versions. This patch is a requirement for http://patchwork.openembedded.org/patch/1858/ because 'autopoint' from the 'aclocal' call will override 'intltool' files and build will fail then. Signed-off-by: Enrico Scholz Acked-by: Chris Larson Acked-by: Sebastian Spaeth Acked-by: Roman I Khimov --- classes/autotools.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 31d357892a..d47630ef54 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -129,12 +129,12 @@ autotools_do_configure() { fi fi mkdir -p m4 + oenote Executing autoreconf --verbose --install --force ${EXTRA_AUTORECONF} $acpaths + autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || oefatal "autoreconf execution failed." if grep "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then oenote Executing intltoolize --copy --force --automake intltoolize --copy --force --automake fi - oenote Executing autoreconf --verbose --install --force ${EXTRA_AUTORECONF} $acpaths - autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || oefatal "autoreconf execution failed." cd $olddir fi ;; -- 2.39.5