Commit 9d1aa46c authored by Alexander Clouter's avatar Alexander Clouter Committed by Thomas Petazzoni
Browse files

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: default avatarAlexander Clouter <alex+buildroot@digriz.org.uk>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 8304c360

package/nftables/Config.in

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

package/nftables/nftables.mk

+8 −2
Original line number Diff line number Diff line
@@ -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