This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[COMMITTED PATCH] NaCl: Do not install <sys/mtio.h>.
- From: Roland McGrath <roland at hack dot frob dot com>
- To: "GNU C. Library" <libc-alpha at sourceware dot org>
- Date: Fri, 11 Sep 2015 14:21:42 -0700 (PDT)
- Subject: [COMMITTED PATCH] NaCl: Do not install <sys/mtio.h>.
- Authentication-results: sourceware.org; auth=none
I'm putting this on both trunk and 2.22 branch. It is a user-visible
change and I didn't bother filing in bugzilla, because no NaCl application
developer will actually see the 2.22-release version before this change.
Thanks,
Roland
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.
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