* [PATCH glibc] Allow building with --disable-nscd again.
@ 2023-03-27 21:04 Flavio Cruz
2023-03-28 13:33 ` Adhemerval Zanella Netto
0 siblings, 1 reply; 2+ messages in thread
From: Flavio Cruz @ 2023-03-27 21:04 UTC (permalink / raw)
To: libc-alpha; +Cc: bug-hurd
The change 88677348b4de breaks the build with undefiend references to
the NSCD functions.
---
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);
--
2.39.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH glibc] Allow building with --disable-nscd again.
2023-03-27 21:04 [PATCH glibc] Allow building with --disable-nscd again Flavio Cruz
@ 2023-03-28 13:33 ` Adhemerval Zanella Netto
0 siblings, 0 replies; 2+ messages in thread
From: Adhemerval Zanella Netto @ 2023-03-28 13:33 UTC (permalink / raw)
To: libc-alpha
On 27/03/23 18:04, Flavio Cruz via Libc-alpha wrote:
> The change 88677348b4de breaks the build with undefiend references to
> the NSCD functions.
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> 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] 2+ messages in thread
end of thread, other threads:[~2023-03-28 13:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-27 21:04 [PATCH glibc] Allow building with --disable-nscd again Flavio Cruz
2023-03-28 13:33 ` Adhemerval Zanella Netto
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).