This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch roland/add-on-abi-tags created. glibc-2.16-ports-merge-396-g5c2bcfc
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 28 Sep 2012 20:22:27 -0000
- Subject: GNU C Library master sources branch roland/add-on-abi-tags created. glibc-2.16-ports-merge-396-g5c2bcfc
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, roland/add-on-abi-tags has been created
at 5c2bcfcd81a9e13027009f8efc75c077aa5a3602 (commit)
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5c2bcfcd81a9e13027009f8efc75c077aa5a3602
commit 5c2bcfcd81a9e13027009f8efc75c077aa5a3602
Author: Roland McGrath <roland@hack.frob.com>
Date: Fri Sep 28 13:09:02 2012 -0700
Handle abi-tags files in add-on directories too.
diff --git a/ChangeLog b/ChangeLog
index dcabba3..d13d00a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2012-09-28 Roland McGrath <roland@hack.frob.com>
+ * csu/Makefile ($(objpfx)abi-tag.h): Handle abi-tags files in add-on
+ directories too.
+
+2012-09-28 Roland McGrath <roland@hack.frob.com>
+
* nss/nsswitch.c (nss_new_service): Conditionalize definition on
[!DO_STATIC_NSS || SHARED], matching its only caller.
diff --git a/csu/Makefile b/csu/Makefile
index 31300a4..5d6ab5e 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -118,10 +118,15 @@ $(addprefix $(objpfx),$(filter-out $(start-installed-name), $(csu-dummies))):\
$(COMPILE.c) -o $@ -x c /dev/null
# These headers are used by the startup code.
-$(objpfx)abi-tag.h: $(..)abi-tags
+$(objpfx)abi-tag.h: $(..)abi-tags \
+ $(foreach add-on,$(add-ons),\
+ $(firstword $(wildcard \
+ $(addprefix $(firstword $(filter /%,$(add-on)) \
+ $(..)$(add-on))/,\
+ abi-tags))))
$(make-target-directory)
rm -f $@.new
- sed -e 's/#.*$$//' -e '/^[ ]*$$/d' $< | \
+ sed -e 's/#.*$$//' -e '/^[ ]*$$/d' $^ | \
while read conf tagos tagver; do \
test `expr '$(config-machine)-$(config-vendor)-$(config-os)' \
: "$$conf"` != 0 || continue; \
@@ -135,7 +140,7 @@ $(objpfx)abi-tag.h: $(..)abi-tags
echo "#endif" ) > $@.new; \
done
if test -r $@.new; then mv -f $@.new $@; \
- else echo >&2 'This configuration not matched in $<'; exit 1; fi
+ else echo >&2 'This configuration not matched in $^'; exit 1; fi
all-Banner-files = $(wildcard $(addsuffix /Banner,\
$(sort $(subdir-srcdirs) \
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f6f58dc9c1ae91c026751525ed600a20a1bf3b13
commit f6f58dc9c1ae91c026751525ed600a20a1bf3b13
Author: Roland McGrath <roland@hack.frob.com>
Date: Fri Sep 28 13:21:08 2012 -0700
Avoid unused static function warning in nsswitch.c.
diff --git a/ChangeLog b/ChangeLog
index cab5f13..dcabba3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-28 Roland McGrath <roland@hack.frob.com>
+
+ * nss/nsswitch.c (nss_new_service): Conditionalize definition on
+ [!DO_STATIC_NSS || SHARED], matching its only caller.
+
2012-09-28 Pino Toscano <toscano.pino@tiscali.it>
* io/tst-mknodat.c: Create a FIFO instead of a socket.
diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 750cd02..1379553 100644
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -786,6 +786,7 @@ nss_getline (char *line)
}
+#if !defined DO_STATIC_NSS || defined SHARED
static service_library *
internal_function
nss_new_service (name_database *database, const char *name)
@@ -810,6 +811,7 @@ nss_new_service (name_database *database, const char *name)
return *currentp;
}
+#endif
#if defined SHARED && defined USE_NSCD
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources