diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2010-01-05 21:10:47 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-01-05 21:10:47 +0000 |
| commit | c37037df6580a4a00919310da29a755acbfed585 (patch) | |
| tree | 1602e53ef2c2061f8bc2bc87164cdd5ac11e2078 /meta | |
| parent | f3092747b4afa7f0d2e929913d3f6bbb7e734ebd (diff) | |
| download | openembedded-core-contrib-c37037df6580a4a00919310da29a755acbfed585.tar.gz | |
gettext.bbclass: Set the gettext dependencies correctly for target, cross and native packages
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/cross.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/gettext.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/native.bbclass | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass index e38d53ced9..4e78a11f2d 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 0b69fa9392..a40e74f819 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 a5f66560d7..01f886294e 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 = "" |