summaryrefslogtreecommitdiff
path: root/meta
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:06:47 +0000
commit89649881bcd0e76d6ee7c85c30e75bb01e1c004f (patch)
tree221f7dea667bc0031352f87326ee8bfe087fbdbb /meta
parent35ac8cd4bd4f2d4ba85bcc88eb30ef07a215c41c (diff)
downloadopenembedded-core-89649881bcd0e76d6ee7c85c30e75bb01e1c004f.tar.gz
openembedded-core-89649881bcd0e76d6ee7c85c30e75bb01e1c004f.tar.bz2
openembedded-core-89649881bcd0e76d6ee7c85c30e75bb01e1c004f.zip
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] Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
-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
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)