public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] Allow building with --disable-nscd again
Date: Tue, 28 Mar 2023 13:59:04 +0000 (GMT)	[thread overview]
Message-ID: <20230328135904.0F8743858C54@sourceware.org> (raw)

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);

                 reply	other threads:[~2023-03-28 13:59 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230328135904.0F8743858C54@sourceware.org \
    --to=azanella@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).