diff options
| author | Ross Burton <ross.burton@intel.com> | 2018-01-09 00:21:10 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-13 22:53:51 +0000 |
| commit | f16657df977e54210774812d4e616403c76eb060 (patch) | |
| tree | 7179b8ae52113885868610442b588119a75c0b5a /meta | |
| parent | 6fef31cdd6be537cfce3862d951762455f5cad2e (diff) | |
| download | openembedded-core-f16657df977e54210774812d4e616403c76eb060.tar.gz openembedded-core-f16657df977e54210774812d4e616403c76eb060.tar.bz2 openembedded-core-f16657df977e54210774812d4e616403c76eb060.zip | |
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@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/autotools.bbclass | 2 |
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() { 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 |