This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[COMMITTED PATCH] Move nss directory into sysdeps Subdirs.
- From: Roland McGrath <roland at hack dot frob dot com>
- To: "GNU C. Library" <libc-alpha at sourceware dot org>
- Date: Tue, 5 Feb 2013 15:18:00 -0800 (PST)
- Subject: [COMMITTED PATCH] Move nss directory into sysdeps Subdirs.
The nss subdirectory (getent) depends on things only built into libc if the
inet subdirectory is built. So it doesn't make much sense to build nss
without inet.
* Makeconfig (all-Depend-files): Add existing
$(sorted-subdirs:=/Depend) files.
(all-subdirs): Remove nss.
* sysdeps/unix/inet/Subdirs: Add it here instead.
* hesiod/Depend: New file.
--- a/Makeconfig
+++ b/Makeconfig
@@ -1041,13 +1041,19 @@ all-subdirs = csu assert ctype locale intl catgets math setjmp signal \
stdlib stdio-common libio malloc string wcsmbs time dirent \
grp pwd posix io termios resource misc socket sysvipc gmon \
gnulib iconv iconvdata wctype manual shadow gshadow po argp \
- crypt nss localedata timezone rt conform debug \
+ crypt localedata timezone rt conform debug \
$(add-on-subdirs) dlfcn elf
ifndef avoid-generated
-all-Depend-files := $(wildcard $(foreach dir,$(all-subdirs),\
- $(firstword $($(dir)-srcdir) \
- $(..)$(dir))/Depend))
+# sysd-sorted itself will contain rules making the sysd-sorted target
+# depend on Depend files. But if you just added a Depend file to an
+# existing directory not in all-subdirs, then sysd-sorted needs to
+# be regenerated, so it depends on existing $(sorted-subdirs:=/Depend) files.
+all-Depend-files := $(wildcard $(sort \
+ $(foreach dir,$(all-subdirs),\
+ $(firstword $($(dir)-srcdir) \
+ $(..)$(dir))/Depend) \
+ $(sorted-subdirs:=/Depend)))
$(common-objpfx)sysd-sorted: $(..)scripts/gen-sorted.awk \
$(common-objpfx)config.make $(..)Makeconfig \
$(wildcard $(sysdirs:=/Subdirs)) \
--- /dev/null
+++ b/hesiod/Depend
@@ -0,0 +1,2 @@
+nss
+resolv
--- a/sysdeps/unix/inet/Subdirs
+++ b/sysdeps/unix/inet/Subdirs
@@ -4,4 +4,5 @@ hesiod
sunrpc
nis
nscd
+nss
streams