summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2015-01-15 06:39:06 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-16 23:08:28 +0000
commit08970d45bfa491b215a0dd90f19995a752e616c9 (patch)
tree7d58eec7c4086f2ff4eb640d9575dcc772bac766
parent2d58e62525b5c50d657ae57df598e33375514409 (diff)
downloadpoky-08970d45bfa491b215a0dd90f19995a752e616c9.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>
-rw-r--r--meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch3
-rw-r--r--meta/recipes-core/glibc/glibc_2.20.bb3
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
4205 D(gshadow) 4205 D(gshadow)
4206-D(hosts) 4206-D(hosts)
4207+DN(hosts) 4207+DN(hosts)
4208 D(initgroups) 4208-D(initgroups)
4209+DN(initgroups)
4209-D(netgroup) 4210-D(netgroup)
4210-D(networks) 4211-D(networks)
4211+DN(netgroup) 4212+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} \
90 --without-selinux \ 90 --without-selinux \
91 --enable-obsolete-rpc \ 91 --enable-obsolete-rpc \
92 --with-kconfig=${STAGING_BINDIR_NATIVE} \ 92 --with-kconfig=${STAGING_BINDIR_NATIVE} \
93 --disable-nscd \
93 ${GLIBC_EXTRA_OECONF}" 94 ${GLIBC_EXTRA_OECONF}"
94 95
95EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" 96EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}"
97EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'libc-inet-anl', '--enable-nscd', '--disable-nscd', d)}"
98
96 99
97do_patch_append() { 100do_patch_append() {
98 bb.build.exec_func('do_fix_readlib_c', d) 101 bb.build.exec_func('do_fix_readlib_c', d)