Skip to contentSkip to conversation

loosen threads dependency for nftables

PATCH New Alexander Clouter 3 participants 3 messages Jan 18, 2015 – Jan 26, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 loosen threads dependency for nftables

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

--

 package/libnftnl/Config.in |   10 ++++++----
 package/nftables/Config.in |    6 ++----
 2 files changed, 8 insertions(+), 8 deletions(-)
package/libnftnl/Config.in +6 -4
index ffd9d5b..af0bb4a 100644
@@ -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
index 1e0798e..b7af244 100644
@@ -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
#1 lore raw

PATCH 1/1 loosen threads dependency for nftables

Alexander, All,

On 2015-01-18 14:23 +0000, Alexander Clouter spake thusly:

Quoted 4 lines

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

Regards,
Yann E. MORIN.

Quoted 62 lines

--
package/libnftnl/Config.in | 10 ++++++----
package/nftables/Config.in | 6 ++----

2 files changed, 8 insertions(+), 8 deletions(-)
package/libnftnl/Config.in +0 -1
index ffd9d5b..af0bb4a 100644
@@ -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"

package/libnftnl/Config.in +1 -0
+	depends on BR2_TOOLCHAIN_HAS_THREADS

select BR2_PACKAGE_MXML
help
Enable XML parsing support

package/libnftnl/Config.in +3 -0
+comment "libnftnl XML parsing support needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+

endif

package/libnftnl/Config.in +2 -3
-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
index 1e0798e..b7af244 100644
@@ -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

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 loosen threads dependency for nftables

In reply to Alexander Clouter

Dear Alexander Clouter,

Quoted 4 lines · Alexander Clouter

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

Thanks, applied, after slightly tweaking the commit title/log. A commit title on a package should have the following form:

<package>: <description>

And in your case, it's actually the libnftl package that gets its thread dependency changed. nftables is only affected as a side-effect.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com