nptl/tst-cancel25 needs to be an internal test

[thirdparty/glibc.git] / nscd / Makefile

diff --git a/nscd/Makefile b/nscd/Makefile
index 9503f539086d32cb21bdf2cb3b4b344579486183..55c46231219fab716850d7265d84655395ab5947 100644 (file)
--- 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-2019 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
@@ -13,18 +13,20 @@
 
 # You should have received a copy of the GNU Lesser General Public
 # License along with the GNU C Library; if not, see
-# <http://www.gnu.org/licenses/>.
+# <https://www.gnu.org/licenses/>.
 
 #
 #      Sub-makefile for nscd portion of the library.
 #
 subdir := nscd
 
+include ../Makeconfig
+
+ifneq ($(use-nscd),no)
 routines := nscd_getpw_r nscd_getgr_r nscd_gethst_r nscd_getai \
            nscd_initgroups nscd_getserv_r nscd_netgroup
 aux    := nscd_helper
-
-include ../Makeconfig
+endif
 
 # To find xmalloc.c
 vpath %.c ../locale/programs
@@ -36,7 +38,7 @@ nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \
                xmalloc xstrdup aicache initgrcache gai res_hconf \
                netgroupcache
 
-ifeq ($(have-thread-library),yes)
+ifeq ($(build-nscd)$(have-thread-library),yesyes)
 
 others += nscd
 others-pie += nscd
@@ -46,11 +48,6 @@ extra-objs = $(nscd-modules:=.o)
 
 endif
 
-ifeq (yes,$(build-static-nss))
-otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
-            $(resolvobjdir)/libresolv.a
-endif
-
 all-nscd-modules := $(nscd-modules) selinux
 ifeq (yes,$(have-selinux))
 ifeq (yes,$(have-libaudit))
@@ -63,7 +60,7 @@ endif
 nscd-modules += selinux
 selinux-LIBS := -lselinux $(libaudit) $(libcap)
 
-# The configure.in check for libselinux and its headers did not use
+# The configure.ac check for libselinux and its headers did not use
 # $SYSINCLUDES.  The directory specified by --with-headers usually
 # contains only the basic kernel interface headers, not something like
 # libselinux.  So the simplest thing is to presume that the standard
@@ -76,64 +73,31 @@ LDLIBS-nscd = $(selinux-LIBS)
 
 include ../Rules
 
-CFLAGS-nscd_getpw_r.c = -fexceptions
-CFLAGS-nscd_getgr_r.c = -fexceptions
-CFLAGS-nscd_gethst_r.c = -fexceptions
-CFLAGS-nscd_getai.c = -fexceptions
-CFLAGS-nscd_initgroups.c = -fexceptions
+CFLAGS-nscd_getpw_r.c += -fexceptions
+CFLAGS-nscd_getgr_r.c += -fexceptions
+CFLAGS-nscd_gethst_r.c += -fexceptions
+CFLAGS-nscd_getai.c += -fexceptions
+CFLAGS-nscd_initgroups.c += -fexceptions
+
+CPPFLAGS-nscd += -D_FORTIFY_SOURCE=2
 
-nscd-cflags = -DIS_IN_nscd=1 -D_FORTIFY_SOURCE=2
 ifeq (yesyes,$(have-fpie)$(build-shared))
-nscd-cflags += $(pie-ccflag)
+CFLAGS-nscd += $(pie-ccflag)
 endif
-ifeq (yes,$(have-ssp))
-nscd-cflags += -fstack-protector
-endif
-
-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)
 
 ifeq (yesyes,$(have-fpie)$(build-shared))
 LDFLAGS-nscd = -Wl,-z,now
 endif
 
-# This makes sure -DNOT_IN_libc is passed for all these modules.
-cpp-srcs-left := $(nscd-modules:=.c)
-lib := nonlib
-include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
+# Set libof-nscd.
+cpp-srcs-left := $(nscd-modules)
+lib := nscd
+include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
 
 $(objpfx)nscd: $(nscd-modules:%=$(objpfx)%.o)
 
 ifeq ($(build-shared),yes)
-$(objpfx)nscd: $(common-objpfx)rt/librt.so $(shared-thread-library) \
-              $(common-objpfx)nis/libnsl.so
+$(objpfx)nscd: $(shared-thread-library)
 else
-$(objpfx)nscd: $(common-objpfx)rt/librt.a $(static-thread-library) \
-              $(common-objpfx)nis/libnsl.a
+$(objpfx)nscd: $(static-thread-library)
 endif