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

libnftl: loosen threads dependency 



nftables works fine without threads, only the XML parsing support in
libnftl requires -lpthread so move the depends into
BR2_PACKAGE_LIBNFTNL_XML.

[Thomas: tweak commit title and log.]

Signed-off-by: default avatarAlexander Clouter <alex+buildroot@digriz.org.uk>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 66d3cce7

package/libnftnl/Config.in

+6 −4
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ config BR2_PACKAGE_LIBNFTNL 
	bool "libnftnl"

	depends on BR2_INET_IPV6

	depends on BR2_LARGEFILE

	depends on BR2_TOOLCHAIN_HAS_THREADS

	# bad headers, no sa_family_t in linux/socket.h

	depends on !(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103 || BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009)

	select BR2_PACKAGE_LIBMNL
@@ -25,12 +24,15 @@ config BR2_PACKAGE_LIBNFTNL_JSON 


config BR2_PACKAGE_LIBNFTNL_XML

	bool "enable XML support"

	depends on BR2_TOOLCHAIN_HAS_THREADS

	select BR2_PACKAGE_MXML

	help

	  Enable XML parsing support



comment "libnftnl XML parsing support needs a toolchain w/ threads"

	depends on !BR2_TOOLCHAIN_HAS_THREADS



endif



comment "libnftnl needs a toolchain w/ threads, IPv6, largefile"

	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || \

		!BR2_LARGEFILE
 
comment "libnftnl needs a toolchain w/ IPv6, largefile"

	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE

package/nftables/Config.in

+2 −4
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ config BR2_PACKAGE_NFTABLES 
	depends on BR2_INET_IPV6

	depends on BR2_LARGEFILE

	depends on BR2_USE_WCHAR

	depends on BR2_TOOLCHAIN_HAS_THREADS

	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4

	select BR2_PACKAGE_GMP

	select BR2_PACKAGE_LIBMNL
@@ -18,7 +17,6 @@ config BR2_PACKAGE_NFTABLES 


	  http://www.netfilter.org/projects/nftables/index.html



comment "nftables needs a toolchain w/ IPv6, largefile, threads, wchar, headers >= 3.4"

comment "nftables needs a toolchain w/ IPv6, largefile, wchar, headers >= 3.4"

	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || \

		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \

		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
 
		!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4