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/libc-abis, created. glibc-2.11-333-g02b104f


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/libc-abis has been created
        at  02b104fbff92e0cd27f34f0588961dc8fc600715 (commit)

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

commit 02b104fbff92e0cd27f34f0588961dc8fc600715
Author: Roland McGrath <roland@redhat.com>
Date:   Tue Apr 6 13:44:31 2010 -0700

    Make sysdeps/add-on handling of libc-abis files match shlib-versions files.

diff --git a/ChangeLog b/ChangeLog
index 48bdfec..c7bbbc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-06  Roland McGrath  <roland@redhat.com>
+
+	* Makerules (libc-abis): Variable removed.
+	($(common-objpfx)libc-abis.h): Don't use it.  Fix dependencies to find
+	main libc-abis file and then sysdeps and add-on files.  Concatenate
+	all those files together for the script to process, matching the rules
+	for shlib-versions files.
+
 2010-04-05  Thomas Schwinge  <thomas@schwinge.name>
 
 	* sysdeps/gnu/unwind-resume.c: New, moved from nptl/sysdeps/pthread/.
diff --git a/Makerules b/Makerules
index d5ff383..9b78743 100644
--- a/Makerules
+++ b/Makerules
@@ -111,12 +111,12 @@ endif # $(versioning) = yes
 
 ifndef avoid-generated
 before-compile := $(common-objpfx)libc-abis.h $(before-compile)
-libc-abis := $(firstword $(wildcard $(foreach D,$(add-ons), $(..)libc-abis)) \
-			 libc-abis)
-$(common-objpfx)libc-abis.h: $(..)scripts/gen-libc-abis $(libc-abis)
-	$(SHELL) $(..)scripts/gen-libc-abis \
-		 $(base-machine)-$(config-vendor)-$(config-os) \
-		 < $(libc-abis) > $@T
+$(common-objpfx)libc-abis.h: $(..)scripts/gen-libc-abis $(..)libc-abis \
+			     $(wildcard $(+sysdep_dirs:=/libc-abis) \
+					$(subdir-srcdirs:=/libc-abis))
+	cat $(filter-out $<,$^) \
+	| $(SHELL) $< $(base-machine)-$(config-vendor)-$(config-os) \
+		      <  > $@T
 	$(move-if-change) $@T $@
 common-generated += $(common-objpfx)libc-abis.h
 endif # avoid-generated

-----------------------------------------------------------------------


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]