This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch release/2.22/master updated. glibc-2.22-13-g3881094
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 11 Sep 2015 21:21:37 -0000
- Subject: GNU C Library master sources branch release/2.22/master updated. glibc-2.22-13-g3881094
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, release/2.22/master has been updated
via 38810947f96183501784c7f477291d04629b36dc (commit)
from 1abe050526295fe0b1402105bb2071c1d25223d2 (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=38810947f96183501784c7f477291d04629b36dc
commit 38810947f96183501784c7f477291d04629b36dc
Author: Roland McGrath <roland@hack.frob.com>
Date: Fri Sep 11 14:16:18 2015 -0700
NaCl: Do not install <sys/mtio.h>.
(cherry picked from commit d57248f0351b307e17476aa1ef812023025c8fd7)
diff --git a/ChangeLog b/ChangeLog
index 44809a6..1c5ec45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-09-11 Roland McGrath <roland@hack.frob.com>
+
+ * sysdeps/nacl/Makefile [$(subdir) = misc] (sysdep_headers):
+ Use 'override' keyword to freeze the value here, preventing
+ the addition of sys/mtio.h by sysdeps/gnu/Makefile.
+
2015-09-04 Roland McGrath <roland@hack.frob.com>
[BZ #18921]
diff --git a/sysdeps/nacl/Makefile b/sysdeps/nacl/Makefile
index 6749a44..1748886 100644
--- a/sysdeps/nacl/Makefile
+++ b/sysdeps/nacl/Makefile
@@ -132,4 +132,13 @@ ifeq ($(subdir),misc)
# sysdeps/.../linux/ directories, but it's still a sysdeps decision to
# install it.
sysdep_headers += bits/mman-linux.h
+
+# This defeats sysdeps/gnu/Makefile's addition of sys/mtio.h, which
+# we do not want. This is a total kludge, but it seems no worse for
+# now than making the sysdeps/gnu/Makefile code conditional on a
+# variable we set here. If some sysdeps/.../Makefile that is later
+# in the list than sysdeps/gnu needed to add to sysdep_headers, this
+# would break it. But sysdeps/gnu is close to last in the list and
+# this coming up seems unlikely.
+override sysdep_headers := $(sysdep_headers)
endif
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
sysdeps/nacl/Makefile | 9 +++++++++
2 files changed, 15 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources