From 88b399bb2c8adcf8563d144c0838cbcdd45c0694 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Tue, 10 Apr 2012 18:33:46 -0700 Subject: tclibc-eglibc.inc: make locale packages dependency conditional Only add locale package dependencies if the eglibc is configured with locale support. This avoids dependencies issues for distros such as poky-tiny [RP: Add PR bump] (From OE-Core rev: bcaea8ec9c9c333f76b368225f60d4fb54c1c7b2) Signed-off-by: Nitin A Kamble Signed-off-by: Richard Purdie --- meta/conf/distro/include/tclibc-eglibc.inc | 23 +++++++++++++++------- .../tasks/task-core-standalone-sdk-target.bb | 2 +- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/meta/conf/distro/include/tclibc-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc index 8b8a214132..aed82d1870 100644 --- a/meta/conf/distro/include/tclibc-eglibc.inc +++ b/meta/conf/distro/include/tclibc-eglibc.inc @@ -23,10 +23,19 @@ LIBC_DEPENDENCIES = "libsegfault \ eglibc-dev \ eglibc-utils \ eglibc-thread-db \ - eglibc-localedata-i18n \ - eglibc-gconv-ibm850 \ - eglibc-gconv-cp1252 \ - eglibc-gconv-iso8859-1 \ - eglibc-gconv-iso8859-15 \ - locale-base-en-us \ - locale-base-en-gb " + ${@get_libc_locales_dependencies(d)}" + +LIBC_LOCALE_DEPENDENCIES = "\ + eglibc-localedata-i18n \ + eglibc-gconv-ibm850 \ + eglibc-gconv-cp1252 \ + eglibc-gconv-iso8859-1 \ + eglibc-gconv-iso8859-15 \ + locale-base-en-us \ + locale-base-en-gb" + +def get_libc_locales_dependencies(d): + if 'libc-locales' in (d.getVar('DISTRO_FEATURES', True) or '').split() : + return d.getVar('LIBC_LOCALE_DEPENDENCIES', True) or '' + else: + return '' diff --git a/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb b/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb index 3835ac7d6a..03628a167d 100644 --- a/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb +++ b/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Target packages for the standalone SDK" -PR = "r6" +PR = "r7" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -- cgit v1.2.3-54-g00ecf