From: Ross Burton Date: Tue, 9 Jan 2018 00:21:10 +0000 (+0000) Subject: autotools: don't wipe gettext macros from gettext X-Git-Tag: uninative-1.8~676 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f16657df977e54210774812d4e616403c76eb060;p=openembedded-core.git autotools: don't wipe gettext macros from gettext We usually forcibly delete any gettext macros we come across to ensure that the latest versions we ship are used, but if we're building gettext then it's a bad idea to delete the gettext macros. Historically this hasn't been a problem as the top-level gettext configure doesn't use AM_GNU_GETTEXT so the deletion was never done, but this may change. Signed-off-by: Ross Burton --- diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index efa4098d63..cc857acc3e 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -200,7 +200,7 @@ autotools_do_configure() { bbnote Executing glib-gettextize --force --copy echo "no" | glib-gettextize --force --copy fi - elif grep -q "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC; then + elif [ "${BPN}" != "gettext" ] && grep -q "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC; then # We'd call gettextize here if it wasn't so broken... cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/ if [ -d ${S}/po/ ]; then