summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorEnrico Scholz <enrico.scholz@sigma-chemnitz.de>2010-04-14 00:19:21 +0000
committerRoman I Khimov <khimov@altell.ru>2010-05-03 00:22:28 +0400
commit1744622831ed26c34c3ae3e0707c48b72c2f4e9c (patch)
treec090c39a61df8c76fdb492f161e0da48b5aedd8e /classes
parent27209156fe0d153f06e77f3c7ca2cdd91e430ae0 (diff)
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 <enrico.scholz@sigma-chemnitz.de> Acked-by: Chris Larson <chris_larson@mentor.com> Acked-by: Sebastian Spaeth <Sebastian@SSpaeth.de> Acked-by: Roman I Khimov <khimov@altell.ru>
Diffstat (limited to 'classes')
-rw-r--r--classes/autotools.bbclass4
1 files 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
;;