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.21-69-g5a9c074
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 12 Feb 2015 21:40:44 -0000
- Subject: GNU C Library master sources branch roland/add-on-abi-tags created. glibc-2.21-69-g5a9c074
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 5a9c074686e70c5be1fa9756e10cccd994d0f930 (commit)
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5a9c074686e70c5be1fa9756e10cccd994d0f930
commit 5a9c074686e70c5be1fa9756e10cccd994d0f930
Author: Roland McGrath <roland@hack.frob.com>
Date: Thu Feb 12 13:28:06 2015 -0800
Handle abi-tags files in add-on directories too.
diff --git a/ChangeLog b/ChangeLog
index 986554f..89aa5ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-12 Roland McGrath <roland@hack.frob.com>
+
+ * csu/Makefile ($(objpfx)abi-tag.h): Handle abi-tags files in add-on
+ directories too.
+
2015-02-12 Rüdiger Sonderfeld <ruediger@c-plusplus.net>
[BZ #17965]
diff --git a/csu/Makefile b/csu/Makefile
index f7cf4af..ea348aa 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -107,10 +107,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; \
@@ -124,7 +129,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