gettext.bbclass: make it simpler to understand

* set the deps for package which can use NLS stuff
* filter the deps out if NLS is not requested

diff --git a/classes/gettext.bbclass b/classes/gettext.bbclass
index a1e00e7..1c7661d 100644 (file)
--- 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"