From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 9 Oct 2008 07:59:28 +0000 (+0000)
Subject: revert last patch as it leads to a build loop. woglinde, please try again.
X-Git-Tag: Release-2010-05/1~5850^2~7^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=355d05a507306d7e18e86fac778e0aaa7f0208d5;p=openembedded.git

revert last patch as it leads to a build loop. woglinde, please try again.
---

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"
+