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 X-Patchwork-Id: 493150 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B3A1D1402C3 for ; Thu, 9 Jul 2015 06:40:36 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=sBJ4wo1y; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; q= dns; s=default; b=OukzKsQbwjSdGCh/9IxI733Sysq8dZd9o2EF28ov/Rtr7z WY/ONln/tgIBSBGJi7CGH3IdwzR41S29qx0tKPFn4AnsvCv8yrvMid4boc4Gnk1A mb45pxgreSeMp8ilCOxNQGN632tbdpNUFN/hAZFpZfIv0//KB08BAizpCyoKs= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; s= default; bh=GM/7fK/K4Dh7NxDo0ZJywQNCCRc=; b=sBJ4wo1yHy9RN/5GqsjE fCE+B7YcutTSAwcQVM3a8UwfH97lTW5m/a8+xediR8RkqGxb3Vgfhbi3vTXgx0Jb gQlmsKeuqN8RcIlsndAPzXJy+CiDqiC2UcHbKCS+B6JYUY0oswBPjg4RXyRcFdQg WDd2uI8XhBBrMArGv0pbMz4= 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: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , 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 To: "GNU C. Library" Subject: [COMMITTED PATCH] Install a dummy 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 * 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 ', so one must exist. +# If sunrpc/ is built in this configuration, it installs a real . +# 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 , which is included by . + This file is installed when the C library does not support the SunRPC + interfaces (including 'struct rpcent' et al) at all. */