From patchwork Wed Jul  8 20:40:22 2015
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Roland McGrath <roland@hack.frob.com>
X-Patchwork-Id: 7595
Received: (qmail 77492 invoked by alias); 8 Jul 2015 20:40:28 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: <mailto:libc-alpha-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 77415 invoked by uid 89); 8 Jul 2015 20:40:24 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-HELO: topped-with-meat.com
MIME-Version: 1.0
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/.
Message-Id: <20150708204022.59A7C2C39FC@topped-with-meat.com>
Date: Wed,  8 Jul 2015 13:40:22 -0700 (PDT)
X-CMAE-Score: 0
X-CMAE-Analysis: v=2.1 cv=SvUDtp+0 c=1 sm=1 tr=0
	a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=hOe2yjtxAAAA:8
	a=kj9zAlcOel0A:10 a=KesGq9DCF8zrU7336loA:9 a=CjuIK1q_8ugA:10

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