mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-30 22:11:59 -09:00
package/libnftnl: remove json support
JSON support and the jansson dependency have been removed in version 1.1.2. Cc: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
committed by
Arnout Vandecappelle (Essensium/Mind)
parent
7535ccfaea
commit
b634d504cb
@@ -13,13 +13,3 @@ config BR2_PACKAGE_LIBNFTNL
|
|||||||
currently used by nftables.
|
currently used by nftables.
|
||||||
|
|
||||||
http://netfilter.org/projects/libnftnl/index.html
|
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
|
|
||||||
|
|||||||
@@ -12,11 +12,4 @@ LIBNFTNL_LICENSE_FILES = COPYING
|
|||||||
LIBNFTNL_INSTALL_STAGING = YES
|
LIBNFTNL_INSTALL_STAGING = YES
|
||||||
LIBNFTNL_DEPENDENCIES = host-pkgconf libmnl
|
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))
|
$(eval $(autotools-package))
|
||||||
|
|||||||
@@ -42,10 +42,6 @@ else
|
|||||||
NFTABLES_CONF_OPTS += --disable-python
|
NFTABLES_CONF_OPTS += --disable-python
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_LIBNFTNL_JSON),yy)
|
|
||||||
NFTABLES_LIBS += -ljansson -lm
|
|
||||||
endif
|
|
||||||
|
|
||||||
NFTABLES_CONF_ENV = LIBS="$(NFTABLES_LIBS)"
|
NFTABLES_CONF_ENV = LIBS="$(NFTABLES_LIBS)"
|
||||||
|
|
||||||
define NFTABLES_LINUX_CONFIG_FIXUPS
|
define NFTABLES_LINUX_CONFIG_FIXUPS
|
||||||
|
|||||||
Reference in New Issue
Block a user