aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-07 08:01:28 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-07 08:01:28 +0100
commit94ef3a4598bbdb9c615280d2e8dccfd422dcf80e (patch)
treee9381e0411d7960b4ddca1f07984e7bd683df387
parentb9413175680cc8afc87d6ed00bcf77ec2f2b8e97 (diff)
downloadmeta-mingw-94ef3a4598bbdb9c615280d2e8dccfd422dcf80e.tar.gz
meta-mingw-94ef3a4598bbdb9c615280d2e8dccfd422dcf80e.tar.bz2
meta-mingw-94ef3a4598bbdb9c615280d2e8dccfd422dcf80e.zip
oecore.patch: Update patch with nls fixes (from meta-darwin)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--oecore.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/oecore.patch b/oecore.patch
index baae8f7..a30858e 100644
--- a/oecore.patch
+++ b/oecore.patch
@@ -234,7 +234,7 @@ index 32b14d3..5dd910f 100644
do_populate_sysroot[stamp-extra-info] = ""
diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass
-index 17c894f..4db6923 100644
+index 95818c6..a4e5ab6 100644
--- a/meta/classes/gettext.bbclass
+++ b/meta/classes/gettext.bbclass
@@ -1,5 +1,5 @@
@@ -247,9 +247,9 @@ index 17c894f..4db6923 100644
@@ -11,7 +11,7 @@ def gettext_oeconf(d):
if oe.utils.inherits(d, 'native', 'cross'):
return '--disable-nls'
- # Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set
-- if (d.getVar('USE_NLS', True) == 'no' or d.getVar('INHIBIT_DEFAULT_DEPS', True)) and not oe.utils.inherits(d, 'nativesdk', 'cross-canadian'):
-+ if (d.getVar('USE_NLS', True) == 'no' or d.getVar('INHIBIT_DEFAULT_DEPS', True)) and not oe.utils.inherits(d, 'cross-canadian'):
+ # Remove the NLS bits if USE_NLS is no.
+- if d.getVar('USE_NLS', True) == 'no' and not oe.utils.inherits(d, 'nativesdk', 'cross-canadian'):
++ if d.getVar('USE_NLS', True) == 'no' and not oe.utils.inherits(d, 'cross-canadian'):
return '--disable-nls'
return "--enable-nls"