From 96b090d1b469720f6f6a44a20f1bb96228979d6b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 30 Oct 2009 02:41:02 +0000 Subject: autotools.bbclass: Remove pointless inherit (from Poky) Signed-off-by: Richard Purdie --- classes/autotools.bbclass | 2 -- 1 file changed, 2 deletions(-) (limited to 'classes/autotools.bbclass') diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 8236a27c76..b4b1c6ec8a 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -1,5 +1,3 @@ -inherit base - # use autotools_stage_all for native packages AUTOTOOLS_NATIVE_STAGE_INSTALL = "1" -- cgit v1.2.3 From 6f481bcc549751aa1d7017de8c77a7606a74c468 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 30 Oct 2009 02:42:06 +0000 Subject: autotools.bbclass: Allow for leading whitespace in gettext and intltool searches (from Poky) Signed-off-by: Richard Purdie --- classes/autotools.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes/autotools.bbclass') diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index b4b1c6ec8a..b7a91693e1 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -113,7 +113,7 @@ autotools_do_configure() { else CONFIGURE_AC=configure.ac fi - if grep "^AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then + if grep "^[[:space:]]*AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then if grep "sed.*POTFILES" $CONFIGURE_AC >/dev/null; then : do nothing -- we still have an old unmodified configure.ac else @@ -121,7 +121,7 @@ autotools_do_configure() { echo "no" | glib-gettextize --force --copy fi fi - if grep "^[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then + if grep "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then oenote Executing intltoolize --copy --force --automake intltoolize --copy --force --automake fi -- cgit v1.2.3 From f6c3cb05c0ef1836a3146a39dc40cbee367486e8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 30 Oct 2009 02:43:12 +0000 Subject: autotools.bbclass: Create m4 directory earlier avoding issues with intltoolize (from Poky) Signed-off-by: Richard Purdie --- classes/autotools.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/autotools.bbclass') diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index b7a91693e1..45b269f4fd 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -121,12 +121,12 @@ autotools_do_configure() { echo "no" | glib-gettextize --force --copy fi fi + mkdir -p m4 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 - mkdir -p m4 autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || oefatal "autoreconf execution failed." cd $olddir fi -- cgit v1.2.3