[oe-commits] [openembedded-core] 01/16: autotools: don't wipe gettext macros from gettext

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 416b97e697f2334f179d20c601f9ce12e919f8f7
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Tue Jan 9 00:21:10 2018 +0000

    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 <ross.burton at intel.com>
---
 meta/classes/autotools.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index efa4098..cc857ac 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.