This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.17-202-gb84660a
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 8 Feb 2013 18:26:50 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.17-202-gb84660a
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, master has been updated
via b84660a888f8c6ac5410f7571ee40b120873dc06 (commit)
from 471514d39d03ef96096767651ecce30630e64c1e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=b84660a888f8c6ac5410f7571ee40b120873dc06
commit b84660a888f8c6ac5410f7571ee40b120873dc06
Author: Roland McGrath <roland@hack.frob.com>
Date: Fri Feb 8 10:18:52 2013 -0800
Support sysdeps/.../include/ directories.
diff --git a/ChangeLog b/ChangeLog
index 7eb2265..23f29a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-08 Roland McGrath <roland@hack.frob.com>
+
+ * Makeconfig (+sysdep-includes): Define with := rather than =.
+ Use an existing include/ subdir of each sysdeps dir before it.
+
2013-02-08 Carlos O'Donell <carlos@redhat.com>
* nscd/connection.c (register_traced_file): Comment function.
diff --git a/Makeconfig b/Makeconfig
index 04d7588..49c5a81 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -765,11 +765,18 @@ endif # $(+cflags) == ""
# Don't duplicate options if we inherited variables from the parent.
+cflags := $(sort $(+cflags))
+# Each sysdeps directory can contain header files that both will be
+# used to compile and will be installed. Each can also contain an
+# include/ subdirectory, whose header files will be used to compile
+# but will not be installed, and will take precedence over the
+# installed files. This mirrors the top-level include/ subdirectory.
++sysdep-includes := $(foreach dir,$(+sysdep_dirs),\
+ $(addprefix -I,$(wildcard $(dir)/include) $(dir)))
+
# These are flags given to the C compiler to tell it to look for
# include files (including ones given in angle brackets) in the parent
# library source directory, in the include directory, and in the
# current directory.
-+sysdep-includes = $(addprefix -I,$(+sysdep_dirs))
+includes = -I$(..)include $(if $(subdir),$(objpfx:%/=-I%)) \
$(+sysdep-includes) $(includes) \
$(patsubst %/,-I%,$(..)) $(libio-include) -I. $(sysincludes)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
Makeconfig | 9 ++++++++-
2 files changed, 13 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources