Allow building with --disable-nscd again
authorFlavio Cruz <flaviocruz@gmail.com>
Tue, 28 Mar 2023 13:16:17 +0000 (10:16 -0300)
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>
Tue, 28 Mar 2023 13:16:17 +0000 (10:16 -0300)
The change 88677348b4de breaks the build with undefiend references to
the NSCD functions.

malloc/set-freeres.c

index f452ff8..42d70d3 100644 (file)
 # 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);