gettext.bbclass: Set the gettext dependencies correctly for target, cross and native...

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index e38d53ced956fcaed8d5ace83ea0f588e08f493f..4e78a11f2d8cefa82dd994948f3041f09969dca7 100644 (file)
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -25,6 +25,8 @@ LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE}"
 
 TOOLCHAIN_OPTIONS = ""
 
+DEPENDS_GETTEXT = "gettext-native"
+
 # Path mangling needed by the cross packaging
 # Note that we use := here to ensure that libdir and includedir are
 # target paths, not CROSS_DIR paths.

diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass
index 0b69fa9392d2455668c410031c6d2413af43f075..a40e74f819ed3b37209224b773dc383e06fb30ac 100644 (file)
--- a/meta/classes/gettext.bbclass
+++ b/meta/classes/gettext.bbclass
@@ -11,5 +11,7 @@ python () {
     gettext_after_parse(d)
 }
 
-DEPENDS =+ "gettext-native"
+DEPENDS_GETTEXT = "gettext gettext-native"
+
+DEPENDS =+ "${DEPENDS_GETTEXT}"
 EXTRA_OECONF += "--enable-nls"

diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index a5f66560d769f8bef3111bf85b075f3390c6f5be..01f886294e74becbb16e204314afecd7006b907f 100644 (file)
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -35,6 +35,8 @@ LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE} "
 STAGING_BINDIR = "${STAGING_BINDIR_NATIVE}"
 STAGING_BINDIR_CROSS = "${STAGING_BINDIR_NATIVE}"
 
+DEPENDS_GETTEXT = "gettext-native"
+
 # Don't use site files for native builds
 export CONFIG_SITE = ""