diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-07-07 18:33:52 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-07-07 18:33:52 +0200 |
| commit | 6212bb67f4695962748a5981e1b9fea105af74f6 (patch) | |
| tree | 0b6a4e918af592a90eb20ffdb2d28ece568ab4bd /nss/Makefile | |
| parent | 36861a968ad143f662db489cd8f859186ee375c2 (diff) | |
| download | glibc-6212bb67f4695962748a5981e1b9fea105af74f6.tar.gz glibc-6212bb67f4695962748a5981e1b9fea105af74f6.tar.xz glibc-6212bb67f4695962748a5981e1b9fea105af74f6.zip | |
nss_files: Move into libc
This is the first step towards fixing bug 27959. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nss/Makefile')
| -rw-r--r-- | nss/Makefile | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/nss/Makefile b/nss/Makefile index 271a0e7716..7259e83bb3 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -98,9 +98,11 @@ subdir-dirs = $(services:%=nss_%) vpath %.c $(subdir-dirs) ../locale/programs ../intl -libnss_files-routines := $(addprefix files-, \ - $(filter-out key, $(databases))) \ - files-initgroups files-init +routines += \ + $(addprefix files-, $(filter-out key, $(databases))) \ + files-init \ + files-initgroups \ + # routines libnss_db-dbs := $(addprefix db-,\ $(filter-out hosts network key alias,\ @@ -116,12 +118,9 @@ libnss_compat-routines := $(addprefix compat-,grp pwd spwd initgroups) \ install-others += $(inst_vardbdir)/Makefile # Build static module into libc if requested -libnss_files-inhibit-o = $(filter-out .os,$(object-suffixes)) libnss_db-inhibit-o = $(filter-out .os,$(object-suffixes)) libnss_compat-inhibit-o = $(filter-out .os,$(object-suffixes)) ifeq ($(build-static-nss),yes) -routines += $(libnss_files-routines) -static-only-routines += $(libnss_files-routines) tests-static += tst-nss-static endif extra-test-objs += nss_test1.os nss_test2.os @@ -138,8 +137,6 @@ libnss-libc = $(common-objpfx)linkobj/libc.so # for new links: $(services:%=$(objpfx)libnss_%.so): libc-for-link = $(libnss-libc) -$(objpfx)libnss_db.so: $(objpfx)libnss_files.so - $(libnss_db-dbs:%=$(objpfx)%.c): $(objpfx)db-%.c: nss_files/files-%.c @rm -f $@.new (echo '#define EXTERN_PARSER';\ |