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: Alexander Clouter <alex+buildroot@digriz.org.uk>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/libnftnl/Config.in b/package/libnftnl/Config.in
index ffd9d5b8b7381d6dc2e13588cdde2f3c43c60353..af0bb4af4508af885ee517a7324441de02025ce4 100644 (file)
--- a/package/libnftnl/Config.in
+++ b/package/libnftnl/Config.in
@@ -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

diff --git a/package/nftables/Config.in b/package/nftables/Config.in
index 1e0798e57fd03116272d372ee3ab677c1370da88..b7af24489f348746e8e411f7e865c39e2cdced0c 100644 (file)
--- a/package/nftables/Config.in
+++ b/package/nftables/Config.in
@@ -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