From 9d973d3b4ed8d2ce3c8997dc21603a0952e7ef0e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 26 Feb 2019 18:27:04 -0800 Subject: default-distrovars: Drop DISTRO_FEATURES_LIBC After eglibc was merged into glibc, Kconfig support was also dropped so these libc features therefore are not effective anymore and can be removed (From OE-Core rev: c62b1cc06613a4cdddf53290e6203559f43fc62d) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/libc-package.bbclass | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'meta/classes/libc-package.bbclass') diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index 34c9151ae9..8859dad566 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass @@ -37,14 +37,11 @@ python __anonymous () { d.setVar("DEPENDS", depends) d.setVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", "compile") break - - # try to fix disable charsets/locales/locale-code compile fail - if bb.utils.contains('DISTRO_FEATURES', 'libc-charsets libc-locales libc-locale-code', True, False, d): - d.setVar('PACKAGE_NO_GCONV', '0') - else: - d.setVar('PACKAGE_NO_GCONV', '1') } +# try to fix disable charsets/locales/locale-code compile fail +PACKAGE_NO_GCONV ?= "0" + OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" locale_base_postinst_ontarget() { -- cgit v1.2.3-54-g00ecf