From: Richard Purdie Date: Tue, 5 Jan 2010 21:10:47 +0000 (+0000) Subject: gettext.bbclass: Set the gettext dependencies correctly for target, cross and native... X-Git-Tag: yocto-4.0~46183 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c37037df6580a4a00919310da29a755acbfed585;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git gettext.bbclass: Set the gettext dependencies correctly for target, cross and native packages Signed-off-by: Richard Purdie --- diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass index e38d53ced95..4e78a11f2d8 100644 --- 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 0b69fa9392d..a40e74f819e 100644 --- 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 a5f66560d76..01f886294e7 100644 --- 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 = ""