diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2015-01-15 06:39:06 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-11 17:39:47 +0000 |
| commit | 965943176c580b7943bb4d94efd58b8818c04919 (patch) | |
| tree | 32e552aa5f9048db0f19d69f67ba5ebae64a1703 /meta/recipes-core | |
| parent | c7b9611ad0ead17a624fc73a60c321ff249c2214 (diff) | |
| download | openembedded-core-contrib-965943176c580b7943bb4d94efd58b8818c04919.tar.gz | |
glibc: Fix up minimal build with libc-libm
This addresses 2 issues discovered trying to build a minimal libc with
libm option. By default nscd was always being built and without inet
enabled there were missing symbols.
[YOCTO #7108]
(From OE-Core rev: 89649881bcd0e76d6ee7c85c30e75bb01e1c004f)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta/recipes-core')
| -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) |