diff options
| author | Roland McGrath <roland@hack.frob.com> | 2013-02-05 14:32:48 -0800 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2013-02-05 14:32:48 -0800 |
| commit | 7bd642f580ef5698bd5b1777a5ba7af2f58c5d8c (patch) | |
| tree | 14890fc649b83573695690e7512e3f81eb849224 | |
| parent | 573c29b288d5cb88f3a09b9b7b5bcf0db762fd5d (diff) | |
| download | glibc-7bd642f580ef5698bd5b1777a5ba7af2f58c5d8c.tar.gz glibc-7bd642f580ef5698bd5b1777a5ba7af2f58c5d8c.tar.xz glibc-7bd642f580ef5698bd5b1777a5ba7af2f58c5d8c.zip | |
Move nss directory into sysdeps Subdirs.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makeconfig | 14 | ||||
| -rw-r--r-- | hesiod/Depend | 2 | ||||
| -rw-r--r-- | sysdeps/unix/inet/Subdirs | 1 |
4 files changed, 19 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 818edb4862..6cd6d8376c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2013-02-05 Roland McGrath <roland@hack.frob.com> + * 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. + * elf/dl-hwcaps.c (_dl_important_hwcaps): Use a variable-length array instead of calling alloca. diff --git a/Makeconfig b/Makeconfig index 8da4ad3b4a..04d7588062 100644 --- 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)) \ diff --git a/hesiod/Depend b/hesiod/Depend new file mode 100644 index 0000000000..0554b47da6 --- /dev/null +++ b/hesiod/Depend @@ -0,0 +1,2 @@ +nss +resolv diff --git a/sysdeps/unix/inet/Subdirs b/sysdeps/unix/inet/Subdirs index 4a191e2993..0a02dd4447 100644 --- a/sysdeps/unix/inet/Subdirs +++ b/sysdeps/unix/inet/Subdirs @@ -4,4 +4,5 @@ hesiod sunrpc nis nscd +nss streams |