[COMMITTED] Install a dummy <rpc/netdb.h> when not building sunrpc/.
diff mbox

Message ID 20150708204022.59A7C2C39FC@topped-with-meat.com
State New
Headers show

Commit Message

Roland McGrath July 8, 2015, 8:40 p.m. UTC
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.

Patch
diff mbox

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.  */