summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2020-09-28 17:18:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-30 15:01:51 +0100
commit87ebed58c7cad06c82fac1e18f2a7a6ab2784c09 (patch)
treeb2c6b1c438d6b966e62eb1a6bee253fdac062b89
parent1dd31a830941878f848f1237a92906cee875cdfc (diff)
downloadpoky-87ebed58c7cad06c82fac1e18f2a7a6ab2784c09.tar.gz
glibc: make nscd optional
NSCD itself is already packaged into its own package, but if it is never going to be needed then it can be disabled and it won't be called from glibc at all. Add a PACKAGECONFIG for NSCD that is enabled by default. As a side effect if NSCD is disable, glibc with and without systemd is binary identical, which helps sstate reuse. (From OE-Core rev: 6ba3e164d7afb69bddd546957331d0de7cb0a10b) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glibc/glibc_2.32.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-core/glibc/glibc_2.32.bb b/meta/recipes-core/glibc/glibc_2.32.bb
index 7049e61625..2a0e464385 100644
--- a/meta/recipes-core/glibc/glibc_2.32.bb
+++ b/meta/recipes-core/glibc/glibc_2.32.bb
@@ -69,13 +69,15 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
69 --enable-stackguard-randomization \ 69 --enable-stackguard-randomization \
70 --disable-crypt \ 70 --disable-crypt \
71 --with-default-link \ 71 --with-default-link \
72 --enable-nscd \
73 ${@bb.utils.contains_any('SELECTED_OPTIMIZATION', '-O0 -Og', '--disable-werror', '', d)} \ 72 ${@bb.utils.contains_any('SELECTED_OPTIMIZATION', '-O0 -Og', '--disable-werror', '', d)} \
74 ${GLIBCPIE} \ 73 ${GLIBCPIE} \
75 ${GLIBC_EXTRA_OECONF}" 74 ${GLIBC_EXTRA_OECONF}"
76 75
77EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" 76EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}"
78 77
78PACKAGECONFIG ??= "nscd"
79PACKAGECONFIG[nscd] = "--enable-nscd,--disable-nscd"
80
79do_patch_append() { 81do_patch_append() {
80 bb.build.exec_func('do_fix_readlib_c', d) 82 bb.build.exec_func('do_fix_readlib_c', d)
81} 83}