public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: Roland McGrath <roland@hack.frob.com>
To: "GNU C. Library" <libc-alpha@sourceware.org>
Subject: [COMMITTED PATCH] Install a dummy <rpc/netdb.h> when not building sunrpc/.
Date: Wed, 08 Jul 2015 20:40:00 -0000	[thread overview]
Message-ID: <20150708204022.59A7C2C39FC@topped-with-meat.com> (raw)

Verified on x86_64-linux-gnu that nothing changes (sunrpc/rpc/netdb.h is
still the one that gets installed).  Verified on arm-nacl that the new
dummy file is installed correctly.


Thanks,
Roland


2015-07-08  Roland McGrath  <roland@hack.frob.com>

	* resolv/rpc/netdb.h: New file.
	* resolv/Makefile [sunrpc not in $(subdirs)] (headers): Add it.

diff --git a/resolv/Makefile b/resolv/Makefile
index 3509d98..1dcb75f 100644
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -72,6 +72,13 @@ xtests-special += $(objpfx)mtrace-tst-leaks2.out
 endif
 endif
 
+ifeq (,$(filter sunrpc,$(subdirs)))
+# The netdb.h we install does '#include <rpc/netdb.h>', so one must exist.
+# If sunrpc/ is built in this configuration, it installs a real <rpc/netdb.h>.
+# If that's not going to happen, install our dummy file.
+headers += rpc/netdb.h
+endif
+
 generated += mtrace-tst-leaks.out tst-leaks.mtrace \
 	     mtrace-tst-leaks2.out tst-leaks2.mtrace
 
diff --git a/resolv/rpc/netdb.h b/resolv/rpc/netdb.h
new file mode 100644
index 0000000..eecea3c
--- /dev/null
+++ b/resolv/rpc/netdb.h
@@ -0,0 +1,3 @@
+/* This is a dummy file for <rpc/netdb.h>, which is included by <netdb.h>.
+   This file is installed when the C library does not support the SunRPC
+   interfaces (including 'struct rpcent' et al) at all.  */

                 reply	other threads:[~2015-07-08 20:40 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150708204022.59A7C2C39FC@topped-with-meat.com \
    --to=roland@hack.frob.com \
    --cc=libc-alpha@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).