diff options
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | grp/Makefile | 6 | ||||
| -rw-r--r-- | inet/Makefile | 5 | ||||
| -rw-r--r-- | login/Makefile | 5 | ||||
| -rw-r--r-- | nscd/Makefile | 5 | ||||
| -rw-r--r-- | nss/Makefile | 16 | ||||
| -rw-r--r-- | posix/Makefile | 8 | ||||
| -rw-r--r-- | pwd/Makefile | 5 | ||||
| -rw-r--r-- | resolv/Makefile | 4 | ||||
| -rw-r--r-- | rt/Makefile | 5 | ||||
| -rw-r--r-- | sunrpc/Makefile | 5 |
11 files changed, 25 insertions, 57 deletions
@@ -1,3 +1,21 @@ +2012-03-23 Daniel Jacobowitz <dmj@google.com> + Paul Pluzhnikov <ppluzhnikov@google.com> + + [BZ #6528] + * grp/Makefile (otherlibs): Don't set it. + * inet/Makefile (otherlibs): Likewise. + * login/Makefile (otherlibs): Likewise. + * nscd/Makefile (otherlibs): Likewise. + * posix/Makefile (otherlibs): Likewise. + * pwd/Makefile (otherlibs): Likewise. + * rt/Makefile (otherlibs): Likewise. + * sunrpc/Makefile (otherlibs): Likewise. + * nss/Makefile (otherlibs): Likewise. + Add libnss_files to routines and static-only-routines. + ($(objpfx)getent): Remove rule. + * resolv/Makefile: Add libnss_dns and libresolv to routines and + static-only-routines. + 2012-03-22 Joseph Myers <joseph@codesourcery.com> [BZ #13892] diff --git a/grp/Makefile b/grp/Makefile index b5c689effa..127310f0de 100644 --- a/grp/Makefile +++ b/grp/Makefile @@ -37,12 +37,6 @@ endif include ../Rules -ifeq (yes,$(build-static-nss)) -otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \ - $(resolvobjdir)/libresolv.a -endif - - ifeq ($(have-thread-library),yes) CFLAGS-getgrgid_r.c = -DUSE_NSCD=1 -fexceptions diff --git a/inet/Makefile b/inet/Makefile index a7b8f2858d..80e2d7ab2e 100644 --- a/inet/Makefile +++ b/inet/Makefile @@ -91,8 +91,3 @@ endif ifeq ($(build-static-nss),yes) CFLAGS += -DSTATIC_NSS endif - -ifeq (yes,$(build-static-nss)) -otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \ - $(resolvobjdir)/libresolv.a -endif diff --git a/login/Makefile b/login/Makefile index f28f007e6f..9b6d2bb78c 100644 --- a/login/Makefile +++ b/login/Makefile @@ -48,11 +48,6 @@ include ../Rules CFLAGS-getpt.c = -fexceptions -ifeq (yes,$(build-static-nss)) -otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \ - $(resolvobjdir)/libresolv.a $(common-objpfx)libc.a -endif - ifeq (yesyes,$(have-fpie)$(build-shared)) pt_chown-cflags += $(pie-ccflag) endif diff --git a/nscd/Makefile b/nscd/Makefile index 9503f53908..ba052eb9de 100644 --- a/nscd/Makefile +++ b/nscd/Makefile @@ -46,11 +46,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)) diff --git a/nss/Makefile b/nss/Makefile index 13accaa01d..54d50d051c 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -43,11 +43,6 @@ xtests = bug-erange include ../Makeconfig -ifeq (yes,$(build-static-nss)) -otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \ - $(resolvobjdir)/libresolv.a -endif - # Specify rules for the nss_* modules. We have some services. services := files db @@ -74,19 +69,16 @@ generated += $(filter-out db-alias.c db-netgrp.c, \ install-others += $(inst_vardbdir)/Makefile -# Build static module if requested -ifneq ($(build-static-nss),yes) +# 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)) +ifeq ($(build-static-nss),yes) +routines += $(libnss_files-routines) +static-only-routines += $(libnss_files-routines) endif include ../Rules - -ifeq (yes,$(build-static-nss)) -$(objpfx)getent: $(objpfx)libnss_files.a -endif - ifeq (yes,$(have-selinux)) LDLIBS-makedb := -lselinux endif diff --git a/posix/Makefile b/posix/Makefile index da6a325a97..922f9c0884 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -112,14 +112,6 @@ generated := $(addprefix wordexp-test-result, 1 2 3 4 5 6 7 8 9 10) \ include ../Rules -ifeq (yes,$(build-static-nss)) -# We need it for "make check" only. We can skip them if they haven't -# been built yet during "make". -otherlibs += $(wildcard $(nssobjdir)/libnss_files.a \ - $(resolvobjdir)/libnss_dns.a \ - $(resolvobjdir)/libresolv.a) -endif - ifeq (no,$(cross-compiling)) # globtest and wordexp-test currently only works with shared libraries ifeq (yes,$(build-shared)) diff --git a/pwd/Makefile b/pwd/Makefile index a99099c8ec..1da4059cb7 100644 --- a/pwd/Makefile +++ b/pwd/Makefile @@ -39,8 +39,3 @@ CFLAGS-getpw.c = -fexceptions CFLAGS-fgetpwent_r.c = -D_IO_MTSAFE_IO endif - -ifeq (yes,$(build-static-nss)) -otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \ - $(resolvobjdir)/libresolv.a -endif diff --git a/resolv/Makefile b/resolv/Makefile index d87119385b..4777317b17 100644 --- a/resolv/Makefile +++ b/resolv/Makefile @@ -55,8 +55,10 @@ subdir-dirs = nss_dns vpath %.c nss_dns libnss_dns-routines := dns-host dns-network dns-canon -ifneq ($(build-static-nss),yes) libnss_dns-inhibit-o = $(filter-out .os,$(object-suffixes)) +ifeq ($(build-static-nss),yes) +routines += $(libnss_dns-routines) $(libresolv-routines) +static-only-routines += $(libnss_dns-routines) $(libresolv-routines) endif ifeq (yesyes,$(build-shared)$(have-thread-library)) diff --git a/rt/Makefile b/rt/Makefile index 651d007aa4..941c471688 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -78,8 +78,3 @@ $(tests:%=$(objpfx)%-bp): $(objpfx)librt_b.a $(bounded-thread-library) endif tst-mqueue7-ARGS = -- $(built-program-cmd) - -ifeq (yes,$(build-static-nss)) -otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \ - $(resolvobjdir)/libresolv.a -endif diff --git a/sunrpc/Makefile b/sunrpc/Makefile index e0339ad77f..48790f4da9 100644 --- a/sunrpc/Makefile +++ b/sunrpc/Makefile @@ -97,11 +97,6 @@ ifeq ($(have-thread-library),yes) xtests += thrsvc endif -ifeq (yes,$(build-static-nss)) -otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \ - $(resolvobjdir)/libresolv.a -endif - ifeq (no,$(cross-compiling)) # We can only build this library if we can run the rpcgen we build. headers += $(rpcsvc:%.x=rpcsvc/%.h) |