summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-01-09 00:21:10 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-14 09:11:57 +0000
commit8418f5555d6b5416efa7ac83289ed5bddd1d3c5a (patch)
tree42a86597d3b24ab5a161f0ff1f31a66c8c434c6a /meta
parenteb9fd561c945fb2511638c891e43eb3c310d2469 (diff)
downloadpoky-8418f5555d6b5416efa7ac83289ed5bddd1d3c5a.tar.gz
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. (From OE-Core rev: f16657df977e54210774812d4e616403c76eb060) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/autotools.bbclass2
1 files changed, 1 insertions, 1 deletions
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() {
200 bbnote Executing glib-gettextize --force --copy 200 bbnote Executing glib-gettextize --force --copy
201 echo "no" | glib-gettextize --force --copy 201 echo "no" | glib-gettextize --force --copy
202 fi 202 fi
203 elif grep -q "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC; then 203 elif [ "${BPN}" != "gettext" ] && grep -q "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC; then
204 # We'd call gettextize here if it wasn't so broken... 204 # We'd call gettextize here if it wasn't so broken...
205 cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/ 205 cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/
206 if [ -d ${S}/po/ ]; then 206 if [ -d ${S}/po/ ]; then