diff options
| author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
| commit | c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch) | |
| tree | a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/classes/gettext.bbclass | |
| parent | d5e67725ac11e3296cad104470931ffa16824b90 (diff) | |
| download | poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz | |
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/gettext.bbclass')
| -rw-r--r-- | meta/classes/gettext.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass index 03b89b2455..0be14246bf 100644 --- a/meta/classes/gettext.bbclass +++ b/meta/classes/gettext.bbclass | |||
| @@ -1,15 +1,15 @@ | |||
| 1 | def gettext_dependencies(d): | 1 | def gettext_dependencies(d): |
| 2 | if d.getVar('INHIBIT_DEFAULT_DEPS', True) and not oe.utils.inherits(d, 'cross-canadian'): | 2 | if d.getVar('INHIBIT_DEFAULT_DEPS') and not oe.utils.inherits(d, 'cross-canadian'): |
| 3 | return "" | 3 | return "" |
| 4 | if d.getVar('USE_NLS', True) == 'no': | 4 | if d.getVar('USE_NLS') == 'no': |
| 5 | return "gettext-minimal-native" | 5 | return "gettext-minimal-native" |
| 6 | return d.getVar('DEPENDS_GETTEXT', False) | 6 | return d.getVar('DEPENDS_GETTEXT', False) |
| 7 | 7 | ||
| 8 | def gettext_oeconf(d): | 8 | def gettext_oeconf(d): |
| 9 | if d.getVar('USE_NLS', True) == 'no': | 9 | if d.getVar('USE_NLS') == 'no': |
| 10 | return '--disable-nls' | 10 | return '--disable-nls' |
| 11 | # Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set | 11 | # Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set |
| 12 | if d.getVar('INHIBIT_DEFAULT_DEPS', True) and not oe.utils.inherits(d, 'cross-canadian'): | 12 | if d.getVar('INHIBIT_DEFAULT_DEPS') and not oe.utils.inherits(d, 'cross-canadian'): |
| 13 | return '--disable-nls' | 13 | return '--disable-nls' |
| 14 | return "--enable-nls" | 14 | return "--enable-nls" |
| 15 | 15 | ||
