gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Thomas Petazzoni 2012-11-10 11:42:38 +00:00 committed by Peter Korsgaard
parent ff3391323a
commit 637f852f1a
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/conntrack-tools/Config.in
View File

@ -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

6
package/conntrack-tools/conntrack-tools.mk
View File

@ -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))