Commit 637f852f authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

conntrack-tools: do not depend on BR2_INET_RPC and use libtirpc when available 



Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent ff339132

package/conntrack-tools/Config.in

+3 −3
Original line number Diff line number Diff line 
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

package/conntrack-tools/conntrack-tools.mk

+6 −0
Original line number Diff line number Diff line
@@ -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))