AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-18 14:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

2012-03-23 Daniel Jacobowitz <dmj@google.com>

Browse Source 
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.
This commit is contained in:
Paul Pluzhnikov 2012-03-23 09:47:03 -07:00
parent 7c69cd143b
commit 3ff4252677
11 changed files with 25 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -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> 2012-03-22 Joseph Myers <joseph@codesourcery.com>
[BZ #13892] [BZ #13892]

6
grp/Makefile
View File

@ -37,12 +37,6 @@ endif
include ../Rules 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) ifeq ($(have-thread-library),yes)
CFLAGS-getgrgid_r.c = -DUSE_NSCD=1 -fexceptions CFLAGS-getgrgid_r.c = -DUSE_NSCD=1 -fexceptions

5
inet/Makefile
View File

@ -91,8 +91,3 @@ endif
ifeq ($(build-static-nss),yes) ifeq ($(build-static-nss),yes)
CFLAGS += -DSTATIC_NSS CFLAGS += -DSTATIC_NSS
endif endif
ifeq (yes,$(build-static-nss))
otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
$(resolvobjdir)/libresolv.a
endif

5
login/Makefile
View File

@ -48,11 +48,6 @@ include ../Rules
CFLAGS-getpt.c = -fexceptions 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)) ifeq (yesyes,$(have-fpie)$(build-shared))
pt_chown-cflags += $(pie-ccflag) pt_chown-cflags += $(pie-ccflag)
endif endif

5
nscd/Makefile
View File

@ -46,11 +46,6 @@ extra-objs = $(nscd-modules:=.o)
endif 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 all-nscd-modules := $(nscd-modules) selinux
ifeq (yes,$(have-selinux)) ifeq (yes,$(have-selinux))
ifeq (yes,$(have-libaudit)) ifeq (yes,$(have-libaudit))

16
nss/Makefile
View File

@ -43,11 +43,6 @@ xtests = bug-erange
include ../Makeconfig 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. # Specify rules for the nss_* modules. We have some services.
services := files db services := files db
@ -74,19 +69,16 @@ generated += $(filter-out db-alias.c db-netgrp.c, \
install-others += $(inst_vardbdir)/Makefile install-others += $(inst_vardbdir)/Makefile
# Build static module if requested # Build static module into libc if requested
ifneq ($(build-static-nss),yes)
libnss_files-inhibit-o = $(filter-out .os,$(object-suffixes)) libnss_files-inhibit-o = $(filter-out .os,$(object-suffixes))
libnss_db-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 endif
include ../Rules include ../Rules
ifeq (yes,$(build-static-nss))
$(objpfx)getent: $(objpfx)libnss_files.a
endif
ifeq (yes,$(have-selinux)) ifeq (yes,$(have-selinux))
LDLIBS-makedb := -lselinux LDLIBS-makedb := -lselinux
endif endif

8
posix/Makefile
View File

@ -112,14 +112,6 @@ generated := $(addprefix wordexp-test-result, 1 2 3 4 5 6 7 8 9 10) \
include ../Rules 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)) ifeq (no,$(cross-compiling))
# globtest and wordexp-test currently only works with shared libraries # globtest and wordexp-test currently only works with shared libraries
ifeq (yes,$(build-shared)) ifeq (yes,$(build-shared))

5
pwd/Makefile
View File

@ -39,8 +39,3 @@ CFLAGS-getpw.c = -fexceptions
CFLAGS-fgetpwent_r.c = -D_IO_MTSAFE_IO CFLAGS-fgetpwent_r.c = -D_IO_MTSAFE_IO
endif endif
ifeq (yes,$(build-static-nss))
otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
$(resolvobjdir)/libresolv.a
endif

4
resolv/Makefile
View File

@ -55,8 +55,10 @@ subdir-dirs = nss_dns
vpath %.c nss_dns vpath %.c nss_dns
libnss_dns-routines := dns-host dns-network dns-canon libnss_dns-routines := dns-host dns-network dns-canon
ifneq ($(build-static-nss),yes)
libnss_dns-inhibit-o = $(filter-out .os,$(object-suffixes)) 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 endif
ifeq (yesyes,$(build-shared)$(have-thread-library)) ifeq (yesyes,$(build-shared)$(have-thread-library))

5
rt/Makefile
View File

@ -78,8 +78,3 @@ $(tests:%=$(objpfx)%-bp): $(objpfx)librt_b.a $(bounded-thread-library)
endif endif
tst-mqueue7-ARGS = -- $(built-program-cmd) tst-mqueue7-ARGS = -- $(built-program-cmd)
ifeq (yes,$(build-static-nss))
otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
$(resolvobjdir)/libresolv.a
endif

5
sunrpc/Makefile
View File

@ -97,11 +97,6 @@ ifeq ($(have-thread-library),yes)
xtests += thrsvc xtests += thrsvc
endif endif
ifeq (yes,$(build-static-nss))
otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
$(resolvobjdir)/libresolv.a
endif
ifeq (no,$(cross-compiling)) ifeq (no,$(cross-compiling))
# We can only build this library if we can run the rpcgen we build. # We can only build this library if we can run the rpcgen we build.
headers += $(rpcsvc:%.x=rpcsvc/%.h) headers += $(rpcsvc:%.x=rpcsvc/%.h)