diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-01 21:09:14 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-01 21:09:14 +0000 |
commit | 3cbf6f2add3027178461ecceb7dfb420b06d3763 (patch) | |
tree | 73412badbad8cd6a5a1cad16c0d4a7200db91038 | |
parent | 94ef3a4598bbdb9c615280d2e8dccfd422dcf80e (diff) | |
download | meta-mingw-dylan.tar.gz |
Update oecore.patch for dylan point releasedylan
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | oecore.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/oecore.patch b/oecore.patch index a30858e..333b715 100644 --- a/oecore.patch +++ b/oecore.patch | |||
@@ -234,7 +234,7 @@ index 32b14d3..5dd910f 100644 | |||
234 | 234 | ||
235 | do_populate_sysroot[stamp-extra-info] = "" | 235 | do_populate_sysroot[stamp-extra-info] = "" |
236 | diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass | 236 | diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass |
237 | index 95818c6..a4e5ab6 100644 | 237 | index 17c894f..4db6923 100644 |
238 | --- a/meta/classes/gettext.bbclass | 238 | --- a/meta/classes/gettext.bbclass |
239 | +++ b/meta/classes/gettext.bbclass | 239 | +++ b/meta/classes/gettext.bbclass |
240 | @@ -1,5 +1,5 @@ | 240 | @@ -1,5 +1,5 @@ |
@@ -247,9 +247,9 @@ index 95818c6..a4e5ab6 100644 | |||
247 | @@ -11,7 +11,7 @@ def gettext_oeconf(d): | 247 | @@ -11,7 +11,7 @@ def gettext_oeconf(d): |
248 | if oe.utils.inherits(d, 'native', 'cross'): | 248 | if oe.utils.inherits(d, 'native', 'cross'): |
249 | return '--disable-nls' | 249 | return '--disable-nls' |
250 | # Remove the NLS bits if USE_NLS is no. | 250 | # Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set |
251 | - if d.getVar('USE_NLS', True) == 'no' and not oe.utils.inherits(d, 'nativesdk', 'cross-canadian'): | 251 | - if (d.getVar('USE_NLS', True) == 'no' or d.getVar('INHIBIT_DEFAULT_DEPS', True)) and not oe.utils.inherits(d, 'nativesdk', 'cross-canadian'): |
252 | + if d.getVar('USE_NLS', True) == 'no' and not oe.utils.inherits(d, 'cross-canadian'): | 252 | + if (d.getVar('USE_NLS', True) == 'no' or d.getVar('INHIBIT_DEFAULT_DEPS', True)) and not oe.utils.inherits(d, 'cross-canadian'): |
253 | return '--disable-nls' | 253 | return '--disable-nls' |
254 | return "--enable-nls" | 254 | return "--enable-nls" |
255 | 255 | ||
@@ -267,7 +267,7 @@ index 8b689e7..28d755b 100644 | |||
267 | 267 | ||
268 | # | 268 | # |
269 | diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass | 269 | diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass |
270 | index 551cafc..33317ce 100644 | 270 | index 80aaec2..5a637c6 100644 |
271 | --- a/meta/classes/package.bbclass | 271 | --- a/meta/classes/package.bbclass |
272 | +++ b/meta/classes/package.bbclass | 272 | +++ b/meta/classes/package.bbclass |
273 | @@ -313,6 +313,12 @@ def copydebugsources(debugsrcdir, d): | 273 | @@ -313,6 +313,12 @@ def copydebugsources(debugsrcdir, d): |