diff options
| -rw-r--r-- | meta/classes/libc-package.bbclass | 8 | ||||
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc-options.inc | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index 957243d1d8..7cde7701ae 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass @@ -35,6 +35,14 @@ python __anonymous () { d.setVar("DEPENDS", depends) d.setVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", "compile") break + + distro_features = (d.getVar('DISTRO_FEATURES', True) or '').split() + + # try to fix disable charsets/locales/locale-code compile fail + if 'libc-charsets' in distro_features and 'libc-locales' in distro_features and 'libc-locale-code' in distro_features: + d.setVar('PACKAGE_NO_GCONV', '0') + else: + d.setVar('PACKAGE_NO_GCONV', '1') } OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" diff --git a/meta/recipes-core/eglibc/eglibc-options.inc b/meta/recipes-core/eglibc/eglibc-options.inc index baf4f4b06c..bd90ee79a2 100644 --- a/meta/recipes-core/eglibc/eglibc-options.inc +++ b/meta/recipes-core/eglibc/eglibc-options.inc @@ -126,10 +126,4 @@ def features_to_eglibc_settings(d): eglibc_cfg('libc-posix-regexp-glibc', distro_features, 'OPTION_POSIX_REGEXP_GLIBC', cnf) eglibc_cfg('libc-posix-wchar-io', distro_features, 'OPTION_POSIX_WIDE_CHAR_DEVICE_IO', cnf) - # try to fix disable charsets/locales/locale-code compile fail - if 'libc-charsets' in distro_features and 'libc-locales' in distro_features and 'libc-locale-code' in distro_features: - d.setVar('PACKAGE_NO_GCONV', '0') - else: - d.setVar('PACKAGE_NO_GCONV', '1') - return "\n".join(cnf) |