diff options
| -rw-r--r-- | meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch | 3 | ||||
| -rw-r--r-- | meta/recipes-core/glibc/glibc_2.20.bb | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch b/meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch index 7136253c8b..332b8f73a6 100644 --- a/meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch +++ b/meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch @@ -4205,7 +4205,8 @@ Index: git/nss/getent.c D(gshadow) -D(hosts) +DN(hosts) - D(initgroups) +-D(initgroups) ++DN(initgroups) -D(netgroup) -D(networks) +DN(netgroup) diff --git a/meta/recipes-core/glibc/glibc_2.20.bb b/meta/recipes-core/glibc/glibc_2.20.bb index 9dd5e67ce8..f67fbfdf0d 100644 --- a/meta/recipes-core/glibc/glibc_2.20.bb +++ b/meta/recipes-core/glibc/glibc_2.20.bb @@ -90,9 +90,12 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-selinux \ --enable-obsolete-rpc \ --with-kconfig=${STAGING_BINDIR_NATIVE} \ + --disable-nscd \ ${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) |