summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/libc-package.bbclass8
-rw-r--r--meta/recipes-core/eglibc/eglibc-options.inc6
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 () {
35 d.setVar("DEPENDS", depends) 35 d.setVar("DEPENDS", depends)
36 d.setVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", "compile") 36 d.setVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", "compile")
37 break 37 break
38
39 distro_features = (d.getVar('DISTRO_FEATURES', True) or '').split()
40
41 # try to fix disable charsets/locales/locale-code compile fail
42 if 'libc-charsets' in distro_features and 'libc-locales' in distro_features and 'libc-locale-code' in distro_features:
43 d.setVar('PACKAGE_NO_GCONV', '0')
44 else:
45 d.setVar('PACKAGE_NO_GCONV', '1')
38} 46}
39 47
40OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" 48OVERRIDES_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):
126 eglibc_cfg('libc-posix-regexp-glibc', distro_features, 'OPTION_POSIX_REGEXP_GLIBC', cnf) 126 eglibc_cfg('libc-posix-regexp-glibc', distro_features, 'OPTION_POSIX_REGEXP_GLIBC', cnf)
127 eglibc_cfg('libc-posix-wchar-io', distro_features, 'OPTION_POSIX_WIDE_CHAR_DEVICE_IO', cnf) 127 eglibc_cfg('libc-posix-wchar-io', distro_features, 'OPTION_POSIX_WIDE_CHAR_DEVICE_IO', cnf)
128 128
129 # try to fix disable charsets/locales/locale-code compile fail
130 if 'libc-charsets' in distro_features and 'libc-locales' in distro_features and 'libc-locale-code' in distro_features:
131 d.setVar('PACKAGE_NO_GCONV', '0')
132 else:
133 d.setVar('PACKAGE_NO_GCONV', '1')
134
135 return "\n".join(cnf) 129 return "\n".join(cnf)