aboutsummaryrefslogtreecommitdiff
path: root/package/nftables
diff options
context:
space:
mode:
authorGravatar Alexander Clouter <alex+buildroot@digriz.org.uk>2014-12-06 23:21:53 +0000
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-01-10 17:45:45 +0100
commit9d1aa46c9e42670513d02c428f452fef7baa481a (patch)
treedcdadd7bac083fc57c5d41d31f675097e844d2ff /package/nftables
parent8304c360b051ebd55078134241d052758a66f665 (diff)
downloadbuildroot-9d1aa46c9e42670513d02c428f452fef7baa481a.tar.gz
buildroot-9d1aa46c9e42670513d02c428f452fef7baa481a.tar.bz2
nftables: making interactive console optional
This lets you (by default enabled) compile out its readline dependency. [Thomas: - remove the patch, which is now unneeded, since we've bumped to nftables 0.4, which as the patch to make readline optional. - remove the new Config.in option, just enable the interactive console when the readline package is enabled.] Signed-off-by: Alexander Clouter <alex+buildroot@digriz.org.uk> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/nftables')
-rw-r--r--package/nftables/Config.in1
-rw-r--r--package/nftables/nftables.mk10
2 files changed, 8 insertions, 3 deletions
diff --git a/package/nftables/Config.in b/package/nftables/Config.in
index 4ddfdbd1af..1e0798e57f 100644
--- a/package/nftables/Config.in
+++ b/package/nftables/Config.in
@@ -8,7 +8,6 @@ config BR2_PACKAGE_NFTABLES
select BR2_PACKAGE_GMP
select BR2_PACKAGE_LIBMNL
select BR2_PACKAGE_LIBNFTNL
- select BR2_PACKAGE_READLINE
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
help
nftables is the project that aims to replace the existing
diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk
index 6be05edbed..35c56e8ed7 100644
--- a/package/nftables/nftables.mk
+++ b/package/nftables/nftables.mk
@@ -7,12 +7,18 @@
NFTABLES_VERSION = 0.4
NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2
NFTABLES_SITE = http://www.netfilter.org/projects/nftables/files
-NFTABLES_DEPENDENCIES = gmp libmnl libnftnl readline host-bison host-flex \
+NFTABLES_DEPENDENCIES = gmp libmnl libnftnl host-bison host-flex \
host-pkgconf $(if $(BR2_NEEDS_GETTEXT),gettext)
NFTABLES_LICENSE = GPLv2
NFTABLES_LICENSE_FILES = COPYING
-NFTABLES_LIBS = -lncurses
+ifeq ($(BR2_PACKAGE_READLINE),y)
+NFTABLES_DEPENDENCIES += readline
+NFTABLES_LIBS += -lncurses
+else
+NFTABLES_CONF_OPTS = --without-cli
+endif
+
ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_LIBNFTNL_JSON),yy)
NFTABLES_LIBS += -ljansson -lm
endif