From patchwork Sat Nov 10 21:42:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 198211 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 74EEF2C0087 for ; Sun, 11 Nov 2012 08:43:35 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 96530FFC16; Sat, 10 Nov 2012 21:43:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sbOy6n-AFGjd; Sat, 10 Nov 2012 21:43:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 473D4101729; Sat, 10 Nov 2012 21:43:26 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C92E28F74A for ; Sat, 10 Nov 2012 21:43:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9C60E8CA2D for ; Sat, 10 Nov 2012 21:43:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zj158OtQCLDT for ; Sat, 10 Nov 2012 21:43:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [88.190.12.23]) by whitealder.osuosl.org (Postfix) with ESMTP id D377F8AA62 for ; Sat, 10 Nov 2012 21:43:30 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id ED593225; Sat, 10 Nov 2012 22:43:00 +0100 (CET) Received: from localhost (37-8-163-215.coucou-networks.fr [37.8.163.215]) by mail.free-electrons.com (Postfix) with ESMTPSA id EBAD916D for ; Sat, 10 Nov 2012 22:42:52 +0100 (CET) From: Thomas Petazzoni To: buildroot@busybox.net Date: Sat, 10 Nov 2012 22:42:41 +0100 Message-Id: <5863a180ea3dd2e145070efa109e54b2c1093102.1352583641.git.thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH 04/11] libtirpc: handle the case where uClibc may have RPC support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net When uClibc has RPC support, it is not needed to define the 'struct rpcent' structure. Signed-off-by: Thomas Petazzoni --- ...out-RPC-support-does-not-install-rpcent.h.patch | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/package/libtirpc/libtirpc-0002-uClibc-without-RPC-support-does-not-install-rpcent.h.patch b/package/libtirpc/libtirpc-0002-uClibc-without-RPC-support-does-not-install-rpcent.h.patch index b950cb3..3ad25af 100644 --- a/package/libtirpc/libtirpc-0002-uClibc-without-RPC-support-does-not-install-rpcent.h.patch +++ b/package/libtirpc/libtirpc-0002-uClibc-without-RPC-support-does-not-install-rpcent.h.patch @@ -5,19 +5,22 @@ Subject: [PATCH] uClibc without RPC support does not install rpcent.h Signed-off-by: Thomas Petazzoni --- - tirpc/rpc/rpcent.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + tirpc/rpc/rpcent.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h -index 7fd93d9..df1f5ed 100644 +index 7fd93d9..8ce05ed 100644 --- a/tirpc/rpc/rpcent.h +++ b/tirpc/rpc/rpcent.h -@@ -47,7 +47,7 @@ +@@ -46,8 +46,9 @@ + __BEGIN_DECLS - /* These are defined in /usr/include/rpc/netdb.h */ +-/* These are defined in /usr/include/rpc/netdb.h */ -#if 0 -+#if __UCLIBC__ ++/* These are defined in /usr/include/rpc/netdb.h, unless we are using ++ the C library without RPC support. */ ++#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_RPC__) struct rpcent { char *r_name; /* name of server for this rpc program */ char **r_aliases; /* alias list */