From patchwork Sat Nov 10 21:42:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 198209 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 A7CE32C0089 for ; Sun, 11 Nov 2012 08:43:19 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C00FA101B1E; Sat, 10 Nov 2012 21:43:12 +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 GAKxSpBOsqDf; Sat, 10 Nov 2012 21:43:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7BF69101B23; Sat, 10 Nov 2012 21:43:05 +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 B08278F74A for ; Sat, 10 Nov 2012 21:43:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8748D8CA2D for ; Sat, 10 Nov 2012 21:43:09 +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 d6QesfE1NvkB for ; Sat, 10 Nov 2012 21:43:08 +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 32E768AA62 for ; Sat, 10 Nov 2012 21:43:08 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 6D4C5162; Sat, 10 Nov 2012 22:42:38 +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 6FACD162 for ; Sat, 10 Nov 2012 22:42:25 +0100 (CET) From: Thomas Petazzoni To: buildroot@busybox.net Date: Sat, 10 Nov 2012 22:42:38 +0100 Message-Id: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH 01/11] conntrack-tools: do not depend on BR2_INET_RPC and use libtirpc when available 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 Signed-off-by: Thomas Petazzoni --- package/conntrack-tools/Config.in | 6 +++--- package/conntrack-tools/conntrack-tools.mk | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/package/conntrack-tools/Config.in b/package/conntrack-tools/Config.in index f109adf..ddede0e 100644 --- a/package/conntrack-tools/Config.in +++ b/package/conntrack-tools/Config.in @@ -1,12 +1,12 @@ config BR2_PACKAGE_CONNTRACK_TOOLS bool "conntrack-tools" depends on BR2_INET_IPV6 - depends on BR2_INET_RPC depends on BR2_LARGEFILE select BR2_PACKAGE_LIBNETFILTER_CONNTRACK select BR2_PACKAGE_LIBNETFILTER_CTHELPER select BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT select BR2_PACKAGE_LIBNETFILTER_QUEUE + select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC help The conntrack-tools are a set of tools targeted at system administrators. @@ -15,5 +15,5 @@ config BR2_PACKAGE_CONNTRACK_TOOLS http://www.netfilter.org/projects/conntrack-tools/ -comment "conntrack-tools requires a toolchain with IPV6, LARGEFILE and RPC support" - depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_INET_RPC +comment "conntrack-tools requires a toolchain with IPV6 and LARGEFILE support" + depends on !BR2_INET_IPV6 || !BR2_LARGEFILE diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk index ce64021..ece3090 100644 --- a/package/conntrack-tools/conntrack-tools.mk +++ b/package/conntrack-tools/conntrack-tools.mk @@ -13,4 +13,10 @@ CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \ CONNTRACK_TOOLS_LICENSE = GPLv2 CONNTRACK_TOOLS_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_LIBTIRPC),y) +CONNTRACK_TOOLS_CONF_ENV += \ + CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/tirpc/" +CONNTRACK_TOOLS_DEPENDENCIES += libtirpc +endif + $(eval $(autotools-package))