public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] Allow building with --disable-nscd again
@ 2023-03-28 13:59 Adhemerval Zanella
  0 siblings, 0 replies; only message in thread
From: Adhemerval Zanella @ 2023-03-28 13:59 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=885d3cda907d0dee54b13cbbf61b040c9951d5a2

commit 885d3cda907d0dee54b13cbbf61b040c9951d5a2
Author: Flavio Cruz <flaviocruz@gmail.com>
Date:   Tue Mar 28 10:16:17 2023 -0300

    Allow building with --disable-nscd again
    
    The change 88677348b4de breaks the build with undefiend references to
    the NSCD functions.

Diff:
---
 malloc/set-freeres.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/malloc/set-freeres.c b/malloc/set-freeres.c
index f452ff838b..42d70d3971 100644
--- a/malloc/set-freeres.c
+++ b/malloc/set-freeres.c
@@ -37,11 +37,13 @@
 # pragma weak __intl_freemem
 # pragma weak __libio_freemem
 # pragma weak __libc_fstab_freemem
+#ifdef USE_NSCD
 # pragma weak __nscd_gr_map_freemem
 # pragma weak __nscd_hst_map_freemem
 # pragma weak __nscd_pw_map_freemem
 # pragma weak __nscd_serv_map_freemem
 # pragma weak __nscd_group_map_freemem
+#endif
 # pragma weak __libc_regcomp_freemem
 # pragma weak __libc_atfork_freemem
 # pragma weak __res_thread_freeres
@@ -95,11 +97,15 @@ __libc_freeres (void)
       call_function_static_weak (__intl_freemem);
       call_function_static_weak (__libio_freemem);
       call_function_static_weak (__libc_fstab_freemem);
+
+#ifdef USE_NSCD
       call_function_static_weak (__nscd_gr_map_freemem);
       call_function_static_weak (__nscd_hst_map_freemem);
       call_function_static_weak (__nscd_pw_map_freemem);
       call_function_static_weak (__nscd_serv_map_freemem);
       call_function_static_weak (__nscd_group_map_freemem);
+#endif
+
       call_function_static_weak (__libc_regcomp_freemem);
       call_function_static_weak (__libc_atfork_freemem);
       /* __res_thread_freeres deallocates the per-thread resolv_context);

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-03-28 13:59 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-28 13:59 [glibc] Allow building with --disable-nscd again Adhemerval Zanella

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).