summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-10-09 02:50:27 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-10-09 02:50:27 +0000
commitbd9b29dbdf3b871551494857a121bec5009d0a4f (patch)
treeb805397e2cff37116ae4e09d20be0fa0c0a140d7 /classes
parent2d4fa9f3f3413d57ea993a3394643f60fefb2d83 (diff)
parent98e90cb91c698cd3dfe808e96b3379cb539b6fa6 (diff)
merge of '83df338c70f7f4819197794f3daebb64a89fcf0a'
and '9f79c6b2ba1ff673c6a3fa4d02579b720046d1cf'
Diffstat (limited to 'classes')
-rw-r--r--classes/gettext.bbclass10
1 files changed, 5 insertions, 5 deletions
diff --git a/classes/gettext.bbclass b/classes/gettext.bbclass
index a1e00e72c1..1c7661ddb9 100644
--- a/classes/gettext.bbclass
+++ b/classes/gettext.bbclass
@@ -1,16 +1,16 @@
+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"
- depends = bb.data.getVar('DEPENDS', d, 1) or ""
- bb.data.setVar('DEPENDS', oe_filter_out('^(virtual/libiconv|virtual/libintl)$', depends, d), d)
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)
python () {
gettext_after_parse(d)
}
-
-DEPENDS =+ "gettext-native"
-EXTRA_OECONF += "--enable-nls"