This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] nscd: fix compilation flags
- From: "Dmitry V. Levin" <ldv at altlinux dot org>
- To: libc-alpha at sourceware dot org
- Date: Tue, 2 Oct 2012 02:50:56 +0400
- Subject: [PATCH] nscd: fix compilation flags
Commit 61653dfb81b776bb72ce4304175b861d77c357a8 added support for
compilers predefining _FORTIFY_SOURCE by adding -U_FORTIFY_SOURCE to
CPPFLAGS for these compilers, but that change doesn't work quite well in
case of nscd: its Makefile sets _FORTIFY_SOURCE using CFLAGS instead of
CPPFLAGS and, thanks to compilation rules defined in Makerules, CPPFLAGS
are passed to compiler after CFLAGS, resulting to a build with
_FORTIFY_SOURCE turned off.
---
* nscd/Makefile (nscd-cppflags): New variable.
Use it instead of nscd-cflags to pass preprocessor flags.
ChangeLog | 5 +++++
nscd/Makefile | 34 ++++++++++++++++++++++++++++++++--
2 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/nscd/Makefile b/nscd/Makefile
index c26ddb1..40e9ec1 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1998,2000,2002-2009,2011,2012 Free Software Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -79,7 +79,8 @@ CFLAGS-nscd_gethst_r.c = -fexceptions
CFLAGS-nscd_getai.c = -fexceptions
CFLAGS-nscd_initgroups.c = -fexceptions
-nscd-cflags = -DIS_IN_nscd=1 -D_FORTIFY_SOURCE=2
+nscd-cppflags = -DIS_IN_nscd=1 -D_FORTIFY_SOURCE=2
+nscd-cflags =
ifeq (yesyes,$(have-fpie)$(build-shared))
nscd-cflags += $(pie-ccflag)
endif
@@ -87,31 +88,60 @@ ifeq (yes,$(have-ssp))
nscd-cflags += -fstack-protector
endif
+CPPFLAGS-nscd.c += $(nscd-cppflags)
+CPPFLAGS-connections.c += $(nscd-cppflags)
+CPPFLAGS-pwdcache.c += $(nscd-cppflags)
+CPPFLAGS-getpwnam_r.c += $(nscd-cppflags)
+CPPFLAGS-getpwuid_r.c += $(nscd-cppflags)
+CPPFLAGS-grpcache.c += $(nscd-cppflags)
+CPPFLAGS-getgrnam_r.c += $(nscd-cppflags)
+CPPFLAGS-getgrgid_r.c += $(nscd-cppflags)
+CPPFLAGS-hstcache.c += $(nscd-cppflags)
+CPPFLAGS-gethstbyad_r.c += $(nscd-cppflags)
+CPPFLAGS-gethstbynm3_r.c += $(nscd-cppflags)
+CPPFLAGS-dbg_log.c += $(nscd-cppflags)
+CPPFLAGS-nscd_conf.c += $(nscd-cppflags)
+CPPFLAGS-nscd_stat.c += $(nscd-cppflags)
+CPPFLAGS-cache.c += $(nscd-cppflags)
+CPPFLAGS-xmalloc.c += $(nscd-cppflags)
+CPPFLAGS-xstrdup.c += $(nscd-cppflags)
+CPPFLAGS-mem.c += $(nscd-cppflags)
+CPPFLAGS-nscd_setup_thread.c += $(nscd-cppflags)
+CPPFLAGS-aicache.c += $(nscd-cppflags)
+CPPFLAGS-selinux.c += $(nscd-cppflags)
+CPPFLAGS-initgrcache.c += $(nscd-cppflags)
+CPPFLAGS-gai.c += $(nscd-cppflags)
+CPPFLAGS-servicescache.c += $(nscd-cppflags)
+CPPFLAGS-getsrvbynm_r.c += $(nscd-cppflags)
+CPPFLAGS-getsrvbypt_r.c += $(nscd-cppflags)
+CPPFLAGS-res_hconf.c += $(nscd-cppflags)
+CPPFLAGS-netgroupcache.c += $(nscd-cppflags)
+
CFLAGS-nscd.c += $(nscd-cflags)
CFLAGS-connections.c += $(nscd-cflags)
CFLAGS-pwdcache.c += $(nscd-cflags)
CFLAGS-getpwnam_r.c += $(nscd-cflags)
CFLAGS-getpwuid_r.c += $(nscd-cflags)
CFLAGS-grpcache.c += $(nscd-cflags)
CFLAGS-getgrnam_r.c += $(nscd-cflags)
CFLAGS-getgrgid_r.c += $(nscd-cflags)
CFLAGS-hstcache.c += $(nscd-cflags)
CFLAGS-gethstbyad_r.c += $(nscd-cflags)
CFLAGS-gethstbynm3_r.c += $(nscd-cflags)
CFLAGS-dbg_log.c += $(nscd-cflags)
CFLAGS-nscd_conf.c += $(nscd-cflags)
CFLAGS-nscd_stat.c += $(nscd-cflags)
CFLAGS-cache.c += $(nscd-cflags)
CFLAGS-xmalloc.c += $(nscd-cflags)
CFLAGS-xstrdup.c += $(nscd-cflags)
CFLAGS-mem.c += $(nscd-cflags)
CFLAGS-nscd_setup_thread.c += $(nscd-cflags)
CFLAGS-aicache.c += $(nscd-cflags)
CFLAGS-selinux.c += $(nscd-cflags)
CFLAGS-initgrcache.c += $(nscd-cflags)
CFLAGS-gai.c += $(nscd-cflags)
CFLAGS-servicescache.c += $(nscd-cflags)
CFLAGS-getsrvbynm_r.c += $(nscd-cflags)
CFLAGS-getsrvbypt_r.c += $(nscd-cflags)
CFLAGS-res_hconf.c += $(nscd-cflags)
CFLAGS-netgroupcache.c += $(nscd-cflags)
--
ldv