diff options
author | Michael Lauer <mickey@vanille-media.de> | 2008-10-09 08:00:09 +0000 |
---|---|---|
committer | Michael Lauer <mickey@vanille-media.de> | 2008-10-09 08:00:09 +0000 |
commit | 7d4c6706e6bac462524f736010eb11fa0729e463 (patch) | |
tree | 5c3cf90e5c2f4b1d5dd313d7523ca019e847dc27 | |
parent | 26b33763ab066b8ddd656def6850de83a5c16498 (diff) | |
parent | 355d05a507306d7e18e86fac778e0aaa7f0208d5 (diff) |
merge of '2e9358fe57665ae0d14365c94a62792b10e1b578'
and 'b926346694764187095a5101a505ba5ad9128a78'
-rw-r--r-- | classes/gettext.bbclass | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/classes/gettext.bbclass b/classes/gettext.bbclass index 1c7661ddb9..982d8c8e5c 100644 --- a/classes/gettext.bbclass +++ b/classes/gettext.bbclass @@ -1,16 +1,17 @@ -DEPENDS =+ "gettext-native virtual/libiconv virtual/libintl" -EXTRA_OECONF += "--enable-nls" - def gettext_after_parse(d): import bb # Remove the NLS bits if USE_NLS is no. if bb.data.getVar('USE_NLS', d, 1) == 'no': cfg = oe_filter_out('^--(dis|en)able-nls$', bb.data.getVar('EXTRA_OECONF', d, 1) or "", d) cfg += " --disable-nls" - bb.data.setVar('EXTRA_OECONF', cfg, d) depends = bb.data.getVar('DEPENDS', d, 1) or "" - bb.data.setVar('DEPENDS', oe_filter_out('^(gettext-native|virtual/libiconv|virtual/libintl)$', depends, d), d) + bb.data.setVar('DEPENDS', oe_filter_out('^(virtual/libiconv|virtual/libintl)$', depends, d), d) + bb.data.setVar('EXTRA_OECONF', cfg, d) python () { gettext_after_parse(d) } + +DEPENDS =+ "gettext-native" +EXTRA_OECONF += "--enable-nls" + |