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-252-g34d8c4b
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 22 Aug 2012 20:18:59 -0000
- Subject: GNU C Library master sources branch roland/add-on-abi-tags created. glibc-2.16-ports-merge-252-g34d8c4b
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 34d8c4be5c0c6f96c6db64235f5f0ca7a300ea49 (commit)
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=34d8c4be5c0c6f96c6db64235f5f0ca7a300ea49
commit 34d8c4be5c0c6f96c6db64235f5f0ca7a300ea49
Author: Roland McGrath <roland@hack.frob.com>
Date: Wed Aug 22 11:51:49 2012 -0700
Handle abi-tags files in add-on directories too.
diff --git a/ChangeLog b/ChangeLog
index 8e64d80..77494b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-22 Roland McGrath <roland@hack.frob.com>
+
+ * csu/Makefile ($(objpfx)abi-tag.h): Handle abi-tags files in add-on
+ directories too.
+
2012-08-22 Dmitry V. Levin <ldv@altlinux.org>
* configure.in (SED): Update AC_CHECK_PROG_VER's version extract regexp
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) \
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources