summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-10-09 07:59:28 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-10-09 07:59:28 +0000
commit355d05a507306d7e18e86fac778e0aaa7f0208d5 (patch)
treeafaea124248f84536ac8f519b0cd9634664a3fe0
parent614c4b2307240f0c7467e69d97a80472942e5902 (diff)
revert last patch as it leads to a build loop. woglinde, please try again.
-rw-r--r--classes/gettext.bbclass11
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"
+