This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH v2] Fix build with --enable-static-nss
- From: Alexey Neyman <stilor at att dot net>
- To: libc-alpha at sourceware dot org
- Date: Wed, 25 Jan 2017 00:45:57 -0800
- Subject: [PATCH v2] Fix build with --enable-static-nss
- Authentication-results: sourceware.org; auth=none
Hi,
[first version of the patch failed during normal, non-static-nss build]
A build failure was reported in Crosstool-NG when glibc is configured
with --enable-static-nss:
https://github.com/crosstool-ng/crosstool-ng/issues/555
The definitions in question are protected by '#ifdef USE_NSCD' while all
their uses are inside '#ifdef USE_NSCD' blocks which are themselves
nested inside a '#ifdef SHARED' or '#if !defined DO_STATIC_NSS ||
defined SHARED' block.
Patch attached.
Regards,
Alexey.
>From 3a36c1eea4fa3b6f3b3b43f7eb91152383ae4ad8 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Tue, 24 Jan 2017 10:31:40 -0800
Subject: [PATCH] Fix build with --enable-static-nss
* nss/nsswitch.c (nscd_init_cb, is_nscd): make the #if around definitions
match those around use, to avoid "defined but not used" error.
Signed-off-by: Alexey Neyman <stilor@att.net>
---
ChangeLog | 5 +++++
nss/nsswitch.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index fde9fd2..e6dc9a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-01-24 Alexey Neyman <stilor@att.net>
+
+ * nss/nsswitch.c (nscd_init_cb, is_nscd): make the #if around definitions
+ match those around use, to avoid "defined but not used" error.
+
2017-01-24 Jakub Jelinek <jakub@redhat.com>
* soft-fp/op-common.h (_FP_MUL, _FP_FMA, _FP_DIV): Add
diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 0a65f6a..8f31658 100644
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -94,7 +94,7 @@ static name_database *service_table;
static name_database_entry *defconfig_entries;
-#ifdef USE_NSCD
+#if defined USE_NSCD && (!defined DO_STATIC_NSS || defined SHARED)
/* Nonzero if this is the nscd process. */
static bool is_nscd;
/* The callback passed to the init functions when nscd is used. */
--
2.9.3