summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-11-10 11:42:38 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2012-11-14 21:57:23 (GMT)
commit637f852f1a4904206a23442eff06d78514ba7265 (patch)
treed7b02f48f4b3f3b010ef09cf66107111f725e671
parentff3391323a2baa8c1238d795ec82701dacb77c6f (diff)
downloadbuildroot-637f852f1a4904206a23442eff06d78514ba7265.tar.gz
buildroot-637f852f1a4904206a23442eff06d78514ba7265.tar.bz2
conntrack-tools: do not depend on BR2_INET_RPC and use libtirpc when available
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/conntrack-tools/Config.in6
-rw-r--r--package/conntrack-tools/conntrack-tools.mk6
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))