projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ff33913)
conntrack-tools: do not depend on BR2_INET_RPC and use libtirpc when available
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sat, 10 Nov 2012 11:42:38 +0000 (11:42 +0000)
committerPeter Korsgaard <jacmet@sunsite.dk>
Wed, 14 Nov 2012 21:57:23 +0000 (22:57 +0100)
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/conntrack-tools/Config.in patch | blob | history
package/conntrack-tools/conntrack-tools.mk patch | blob | history

diff --git a/package/conntrack-tools/Config.in b/package/conntrack-tools/Config.in
index f109adf1d8189c3fd86d8d0b01d1d41cefb71388..ddede0eeab2faad4844543841fd06271fc3fd72b 100644 (file)
--- 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 ce6402142517d8115b6f326d9aebbd204bf5692b..ece30903d8734e3b116c8d1116ed08460b46a2b2 100644 (file)
--- 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))