[oe-commits] woglinde : gettex.bbclass: reworking

[GIT User account]

Module: openembedded.git
Branch: woglinde/gettext
Commit: a29c4dc5f9e4094863442ea75059f801f353459a
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a29c4dc5f9e4094863442ea75059f801f353459a

Author: woglinde <heinold at inf.fu-berlin.de>
Date:   Wed Dec 10 00:26:18 2008 +0100

gettex.bbclass: reworking
* first the assume nls is set
* in the second step after parsing we
  look at USE_NLS and if it is set to no
  we strip out the gettext support
* for native and cross packages we have to remove the virtual statements
  otherwise we break glibc builds

---

 classes/gettext.bbclass |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/classes/gettext.bbclass b/classes/gettext.bbclass
index bc0a1df..f6d2cf8 100644
--- a/classes/gettext.bbclass
+++ b/classes/gettext.bbclass
@@ -1,18 +1,23 @@
-DEPENDS =+ "gettext-native"
+DEPENDS =+ "gettext-native virtual/libiconv virtual/libintl"
+EXTRA_OECONF += "--enable-nls"
+
 def gettext_after_parse(d):
     import bb
+    depends = bb.data.getVar('DEPENDS', d, 1) or ""
     # 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 = oe_filter_out('^(gettext-native|virtual/libiconv|virtual/libintl)$', depends, d)
+    # cross and native packages must be handled diffrently
+    # gettext-native should be enough as dependency
+    else:
+	if bb.data.getVar('PN', d, 1).find('-cross') >=0 or bb.data.getVar('PN', d, 1).find('-native') >= 0:
+		depends = oe_filter_out('^(virtual/libiconv|virtual/libintl)$', depends, d)
+    bb.data.setVar('DEPENDS', depends, d)
 
 python () {
     gettext_after_parse(d)
 }
 
-DEPENDS =+ "gettext-native"
-EXTRA_OECONF += "--enable-nls"
-