[Buildroot] [PATCH] package/libnftnl: remove json support

Baruch Siach baruch at tkos.co.il
Wed May 18 08:26:00 UTC 2022


JSON support and the jansson dependency have been removed in version
1.1.2.

Cc: Yegor Yefremov <yegorslists at googlemail.com>
Signed-off-by: Baruch Siach <baruch at tkos.co.il>
---
 package/libnftnl/Config.in   | 10 ----------
 package/libnftnl/libnftnl.mk |  7 -------
 package/nftables/nftables.mk |  4 ----
 3 files changed, 21 deletions(-)

diff --git a/package/libnftnl/Config.in b/package/libnftnl/Config.in
index 347223ce22a0..0d17751e5092 100644
--- a/package/libnftnl/Config.in
+++ b/package/libnftnl/Config.in
@@ -13,13 +13,3 @@ config BR2_PACKAGE_LIBNFTNL
 	  currently used by nftables.
 
 	  http://netfilter.org/projects/libnftnl/index.html
-
-if BR2_PACKAGE_LIBNFTNL
-
-config BR2_PACKAGE_LIBNFTNL_JSON
-	bool "enable JSON support"
-	select BR2_PACKAGE_JANSSON
-	help
-	  Enable JSON parsing support
-
-endif
diff --git a/package/libnftnl/libnftnl.mk b/package/libnftnl/libnftnl.mk
index 616afa630720..7ba1158154d9 100644
--- a/package/libnftnl/libnftnl.mk
+++ b/package/libnftnl/libnftnl.mk
@@ -12,11 +12,4 @@ LIBNFTNL_LICENSE_FILES = COPYING
 LIBNFTNL_INSTALL_STAGING = YES
 LIBNFTNL_DEPENDENCIES = host-pkgconf libmnl
 
-ifeq ($(BR2_PACKAGE_LIBNFTNL_JSON),y)
-LIBNFTNL_CONF_OPTS += --with-json-parsing
-LIBNFTNL_DEPENDENCIES += jansson
-else
-LIBNFTNL_CONF_OPTS += --without-json-parsing
-endif
-
 $(eval $(autotools-package))
diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk
index 232d54148868..a64c36094ec1 100644
--- a/package/nftables/nftables.mk
+++ b/package/nftables/nftables.mk
@@ -42,10 +42,6 @@ else
 NFTABLES_CONF_OPTS += --disable-python
 endif
 
-ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_LIBNFTNL_JSON),yy)
-NFTABLES_LIBS += -ljansson -lm
-endif
-
 NFTABLES_CONF_ENV = LIBS="$(NFTABLES_LIBS)"
 
 define NFTABLES_LINUX_CONFIG_FIXUPS
-- 
2.35.1




More information about the buildroot mailing list