Quellcode durchsuchen

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>
Alexander Clouter vor 10 Jahren
Ursprung
Commit
9d1aa46c9e
2 geänderte Dateien mit 8 neuen und 3 gelöschten Zeilen
  1. 0 1
      package/nftables/Config.in
  2. 8 2
      package/nftables/nftables.mk

+ 0 - 1
package/nftables/Config.in

@@ -8,7 +8,6 @@ config BR2_PACKAGE_NFTABLES
 	select BR2_PACKAGE_GMP
 	select BR2_PACKAGE_GMP
 	select BR2_PACKAGE_LIBMNL
 	select BR2_PACKAGE_LIBMNL
 	select BR2_PACKAGE_LIBNFTNL
 	select BR2_PACKAGE_LIBNFTNL
-	select BR2_PACKAGE_READLINE
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	help
 	help
 	  nftables is the project that aims to replace the existing
 	  nftables is the project that aims to replace the existing

+ 8 - 2
package/nftables/nftables.mk

@@ -7,12 +7,18 @@
 NFTABLES_VERSION = 0.4
 NFTABLES_VERSION = 0.4
 NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2
 NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2
 NFTABLES_SITE = http://www.netfilter.org/projects/nftables/files
 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)
 	host-pkgconf $(if $(BR2_NEEDS_GETTEXT),gettext)
 NFTABLES_LICENSE = GPLv2
 NFTABLES_LICENSE = GPLv2
 NFTABLES_LICENSE_FILES = COPYING
 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)
 ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_LIBNFTNL_JSON),yy)
 NFTABLES_LIBS += -ljansson -lm
 NFTABLES_LIBS += -ljansson -lm
 endif
 endif