This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch roland/add-on-abi-tags created. glibc-2.16-ports-merge-413-gcbf726f


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  cbf726ff1e87f6274603ce7ea63217732ded0d56 (commit)

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=cbf726ff1e87f6274603ce7ea63217732ded0d56

commit cbf726ff1e87f6274603ce7ea63217732ded0d56
Author: Roland McGrath <roland@hack.frob.com>
Date:   Mon Oct 1 12:56:15 2012 -0700

    Handle abi-tags files in add-on directories too.

diff --git a/ChangeLog b/ChangeLog
index da45762..14f9ff6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-10-01  Roland McGrath  <roland@hack.frob.com>
 
+	* csu/Makefile ($(objpfx)abi-tag.h): Handle abi-tags files in add-on
+	directories too.
+
+2012-10-01  Roland McGrath  <roland@hack.frob.com>
+
 	* sysdeps/unix/sysv/linux/init-first.c: Moved to ...
 	* csu/init-first.c: ... here.
 	* sysdeps/unix/sysv/linux/powerpc/init-first.c: Update #include.
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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]