diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-02-26 18:27:04 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-28 13:20:21 +0000 |
commit | c62b1cc06613a4cdddf53290e6203559f43fc62d (patch) | |
tree | 090e5077e2023d574b227df577cf5ddb71132483 /meta/recipes-core | |
parent | cc80e72be47d8d0ddb1950f1d206eced835231cf (diff) | |
download | openembedded-core-contrib-c62b1cc06613a4cdddf53290e6203559f43fc62d.tar.gz |
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
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc_2.29.bb | 3 | ||||
-rw-r--r-- | meta/recipes-core/libxml/libxml2_2.9.8.bb | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 6305f553b4..3c2440db0e 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -41,8 +41,6 @@ EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'Tr # meson's python configuration pokes into python3 configuration, so this provides the native config to it. unset _PYTHON_SYSCONFIGDATA_NAME -REQUIRED_DISTRO_FEATURES_libc-glibc = "${@'libc-charsets libc-locale-code libc-locales' if bb.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d) else ''}" - S = "${WORKDIR}/glib-${PV}" PACKAGECONFIG ??= "system-pcre libmount" diff --git a/meta/recipes-core/glibc/glibc_2.29.bb b/meta/recipes-core/glibc/glibc_2.29.bb index beddbffee2..bd8aa6d503 100644 --- a/meta/recipes-core/glibc/glibc_2.29.bb +++ b/meta/recipes-core/glibc/glibc_2.29.bb @@ -89,12 +89,11 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --enable-stackguard-randomization \ --disable-crypt \ --with-default-link \ + --enable-nscd \ ${GLIBCPIE} \ ${GLIBC_EXTRA_OECONF}" EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'libc-inet-anl', '--enable-nscd', '--disable-nscd', d)}" - do_patch_append() { bb.build.exec_func('do_fix_readlib_c', d) diff --git a/meta/recipes-core/libxml/libxml2_2.9.8.bb b/meta/recipes-core/libxml/libxml2_2.9.8.bb index 0e2461154b..62643bc764 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.8.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.8.bb @@ -42,8 +42,6 @@ inherit autotools pkgconfig binconfig-disabled ptest distro_features_check inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} -REQUIRED_DISTRO_FEATURES_libc-glibc = "${@'libc-charsets libc-locale-code libc-locales' if bb.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d) else ''}" - RDEPENDS_${PN}-ptest += "make ${@bb.utils.contains('PACKAGECONFIG', 'python', 'libgcc python3-core python3-logging python3-shell python3-stringold python3-threading python3-unittest ${PN}-python', '', d)}" RDEPENDS_${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" |