Revert "zeromq: needs NPTL"

PATCH New Waldemar Brodkorb 2 participants 6 messages May 5, 2018 – Jun 30, 2018

lore

Share & tools

lore

Waldemar Brodkorb

author

2018-05-05 16:05 UTC #0 lore raw

PATCH 1/1 Revert "zeromq: needs NPTL"

This reverts commit 1e2a8d4111f57e79c1848c7a70c6501e2bdacd58.

Latest uClibc-ng release supports the missing functions even for Linuxthreads. The toolchains must be rebuilded before commit.

Signed-off-by Waldemar Brodkorb <[email protected]>

---
 package/circus/Config.in       | 6 +++---
 package/cppzmq/Config.in       | 6 +++---
 package/czmq/Config.in         | 6 +++---
 package/filemq/Config.in       | 6 +++---
 package/mongrel2/Config.in     | 6 +++---
 package/php-zmq/Config.in      | 6 +++---
 package/python-pyzmq/Config.in | 6 +++---
 package/zeromq/Config.in       | 6 +++---
 package/zmqpp/Config.in        | 6 +++---
 package/zyre/Config.in         | 6 +++---
 10 files changed, 30 insertions(+), 30 deletions(-)

package/circus/Config.in +3 -3

index e09d875..f1cd93c 100644
@@ -2,7 +2,7 @@ config BR2_PACKAGE_CIRCUS
 	bool "circus"
 	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
 	depends on BR2_INSTALL_LIBSTDCPP # pyzmq -> zeromq
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pyzmq -> zeromq
+	depends on BR2_TOOLCHAIN_HAS_THREADS # pyzmq -> zeromq
 	select BR2_PACKAGE_PYTHON_IOWAIT # runtime
 	select BR2_PACKAGE_PYTHON_PSUTIL # runtime
 	select BR2_PACKAGE_PYTHON_PYZMQ # runtime

@@ -14,6 +14,6 @@ config BR2_PACKAGE_CIRCUS
 
 	  https://circus.readthedocs.org/en/latest/
 
-comment "circus needs Python and a toolchain w/ C++, NPTL"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
+comment "circus needs Python and a toolchain w/ C++, threads"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
 		!(BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3)

package/cppzmq/Config.in +3 -3

index d0ae0c2..c984c15 100644
@@ -1,12 +1,12 @@
 config BR2_PACKAGE_CPPZMQ
 	bool "cppzmq"
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # zeromq
+	depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
 	select BR2_PACKAGE_ZEROMQ
 	help
 	  C++ binding for zeromq (ZeroMQ, 0MQ, zmq).
 
 	  http://github.com/zeromq/cppzmq
 
-comment "cppzmq needs a toolchain w/ C++, NPTL"
-	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS_NPTL)
+comment "cppzmq needs a toolchain w/ C++, threads"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)

package/czmq/Config.in +3 -3

index d4ca46c..71389fc 100644
@@ -2,13 +2,13 @@ config BR2_PACKAGE_CZMQ
 	bool "czmq"
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_INSTALL_LIBSTDCPP # zeromq
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # zeromq
+	depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
 	select BR2_PACKAGE_ZEROMQ
 	help
 	  High-level C Binding for 0MQ
 
 	  http://czmq.zeromq.org/
 
-comment "czmq needs a toolchain w/ C++, NPTL"
+comment "czmq needs a toolchain w/ C++, threads"
 	depends on BR2_USE_MMU
-	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS_NPTL)
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)

package/filemq/Config.in +3 -3

index b015e2e..b4720c1 100644
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_FILEMQ
 	bool "filemq"
 	depends on BR2_INSTALL_LIBSTDCPP # zeromq
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # zeromq
+	depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
 	depends on BR2_USE_MMU # czmq
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_CZMQ

@@ -11,6 +11,6 @@ config BR2_PACKAGE_FILEMQ
 
 	  http://github.com/zeromq/filemq
 
-comment "filemq needs a toolchain w/ C++, NPTL"
+comment "filemq needs a toolchain w/ C++, threads"
 	depends on BR2_USE_MMU
-	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS_NPTL)
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)

package/mongrel2/Config.in +3 -3

index 09bc8bd..a9b09b7 100644
@@ -7,15 +7,15 @@ config BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS
 	default y if BR2_TOOLCHAIN_USES_UCLIBC && \
 		(BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || BR2_sparc || BR2_x86_64)
 
-comment "mongrel2 needs a uClibc or glibc toolchain w/ C++, NPTL, dynamic library"
+comment "mongrel2 needs a uClibc or glibc toolchain w/ C++, threads, dynamic library"
 	depends on !BR2_INSTALL_LIBSTDCPP || \
-		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \
+		!BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
 		!BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS
 
 config BR2_PACKAGE_MONGREL2
 	bool "mongrel2"
 	depends on BR2_INSTALL_LIBSTDCPP # zeromq
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # zeromq
+	depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
 	depends on !BR2_STATIC_LIBS # uses dlopen()
 	depends on BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS
 	select BR2_PACKAGE_SQLITE

package/php-zmq/Config.in +3 -3

index 3f7406b..058f93d 100644
@@ -1,11 +1,11 @@
-comment "php-zmq needs a toolchain w/ C++, NPTL"
-	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS_NPTL)
+comment "php-zmq needs a toolchain w/ C++, threads"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
 
 config BR2_PACKAGE_PHP_ZMQ
 	bool "php-zmq"
 	depends on BR2_PACKAGE_PHP
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # zeromq
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_ZEROMQ
 	help
 	  ZeroMQ messaging bindings for PHP

package/python-pyzmq/Config.in +3 -3

index 2501912..8f33a63 100644
@@ -1,13 +1,13 @@
 config BR2_PACKAGE_PYTHON_PYZMQ
 	bool "python-pyzmq"
 	depends on BR2_INSTALL_LIBSTDCPP # zeromq
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # zeromq
+	depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
 	select BR2_PACKAGE_ZEROMQ
 	help
 	  This package contains the python language binding for zeromq.
 
 	  http://zeromq.org/bindings:python
 
-comment "python-pyzmq needs a toolchain w/ C++, NPTL"
+comment "python-pyzmq needs a toolchain w/ C++, threads"
 	depends on BR2_PACKAGE_PYTHON
-	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS_NPTL)
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)

package/zeromq/Config.in +3 -3

index 25e438a..69be9f0 100644
@@ -1,10 +1,10 @@
-comment "zeromq needs a toolchain w/ C++, NPTL"
-	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS_NPTL)
+comment "zeromq needs a toolchain w/ C++, threads"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
 
 config BR2_PACKAGE_ZEROMQ
 	bool "zeromq"
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	help

package/zmqpp/Config.in +3 -3

index b9d4dcf..8dad80e 100644
@@ -3,7 +3,7 @@ config BR2_PACKAGE_ZMQPP
 	# c++1x support
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # zeromq
+	depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
 	select BR2_PACKAGE_ZEROMQ
 	help
 	  C++ binding for zeromq (ZeroMQ, 0MQ, zmq).

@@ -13,8 +13,8 @@ config BR2_PACKAGE_ZMQPP
 
 	  http://github.com/benjamg/zmqpp
 
-comment "zmqpp needs a toolchain w/ C++, NPTL, gcc >= 4.7"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
+comment "zmqpp needs a toolchain w/ C++, threads, gcc >= 4.7"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
 
 if BR2_PACKAGE_ZMQPP

package/zyre/Config.in +3 -3

index 340e977..21a0884 100644
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_ZYRE
 	bool "zyre"
 	depends on BR2_INSTALL_LIBSTDCPP # zeromq
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # zeromq
+	depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
 	depends on BR2_USE_MMU # czmq
 	select BR2_PACKAGE_CZMQ
 	select BR2_PACKAGE_ZEROMQ

@@ -11,6 +11,6 @@ config BR2_PACKAGE_ZYRE
 
 	  http://zyre.org
 
-comment "zyre needs a toolchain w/ C++, NPTL"
+comment "zyre needs a toolchain w/ C++, threads"
 	depends on BR2_USE_MMU
-	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS_NPTL)
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)

Signature · 1 line

2.1.4

Thomas Petazzoni

2018-05-08 13:34 UTC #1 lore raw

PATCH 1/1 Revert "zeromq: needs NPTL"

Hello,

Thanks Waldemar for fixing this issue. Some questions below, though.

Quoted 3 lines · Waldemar Brodkorb

This reverts commit 1e2a8d4111f57e79c1848c7a70c6501e2bdacd58.
Latest uClibc-ng release supports the missing functions even for

What is "Latest" ? 1.0.30 ?

In fact, it's not even in an uClibc-ng release I believe, it's fixed by 0002-librt-declare-clock_nanosleep-independent-of-thread-.patch, which will be part of 1.0.31. Is this correct ?

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

Waldemar Brodkorb

author

2018-05-08 17:36 UTC #2 lore raw

PATCH 1/1 Revert "zeromq: needs NPTL"

Hi Thomas,
Thomas Petazzoni wrote,

Quoted 10 lines

Hello,
Thanks Waldemar for fixing this issue. Some questions below, though.
Quoted 3 lines · Waldemar Brodkorb
This reverts commit 1e2a8d4111f57e79c1848c7a70c6501e2bdacd58.
Latest uClibc-ng release supports the missing functions even for
What is "Latest" ? 1.0.30 ?

Yes, 1.0.30. Or do you know of any newer release? ;)

Quoted 3 lines

In fact, it's not even in an uClibc-ng release I believe, it's fixed by 0002-librt-declare-clock_nanosleep-independent-of-thread-.patch, which will be part of 1.0.31. Is this correct ?

No. ZeroMQ introduced the usage of pthread_condattr_{s,g}etclock(), which was added here 04a676f3c8d2443499f27612f69ee88e12089e61 for Linuxthreads.
It compiled very well without the hotfix for clock_nanosleep declaration added via 0002-librt-declare-clock_nanosleep-independent-of-thread-.patch.

best regards
Waldemar

Thomas Petazzoni

2018-05-09 07:22 UTC #3 lore raw

PATCH 1/1 Revert "zeromq: needs NPTL"

Hello,

Quoted 10 lines · Waldemar Brodkorb

Quoted 8 lines
Thanks Waldemar for fixing this issue. Some questions below, though.
Quoted 3 lines · Waldemar Brodkorb
This reverts commit 1e2a8d4111f57e79c1848c7a70c6501e2bdacd58.
Latest uClibc-ng release supports the missing functions even for
What is "Latest" ? 1.0.30 ?
Yes, 1.0.30. Or do you know of any newer release? ;)

No, but the problem with saying "Latest uClibc-ng release" in a commit log is that it's not going to be very informative 6 months or 2 years from now, when someone reads the commit log :-)

Saying "Since uClibc-ng 1.0.30, the missing functions are supported" makes it very clear, and will remain useful in the future.

Quoted 10 lines

Quoted 3 lines
In fact, it's not even in an uClibc-ng release I believe, it's fixed by 0002-librt-declare-clock_nanosleep-independent-of-thread-.patch, which will be part of 1.0.31. Is this correct ?
No. ZeroMQ introduced the usage of pthread_condattr_{s,g}etclock(), which was added here 04a676f3c8d2443499f27612f69ee88e12089e61 for Linuxthreads.
It compiled very well without the hotfix for clock_nanosleep declaration added via 0002-librt-declare-clock_nanosleep-independent-of-thread-.patch.

OK, thanks for the explanation!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

Waldemar Brodkorb

author

2018-05-09 21:07 UTC #4 lore raw

PATCH 1/1 Revert "zeromq: needs NPTL"

Hi Thomas,
Thomas Petazzoni wrote,

Quoted 13 lines

Hello,
Quoted 9 lines · Waldemar Brodkorb
Quoted 8 lines
Thanks Waldemar for fixing this issue. Some questions below, though.
Quoted 3 lines · Waldemar Brodkorb
This reverts commit 1e2a8d4111f57e79c1848c7a70c6501e2bdacd58.
Latest uClibc-ng release supports the missing functions even for
What is "Latest" ? 1.0.30 ?

Quoted 8 lines

Quoted 1 line
Yes, 1.0.30. Or do you know of any newer release? ;)
No, but the problem with saying "Latest uClibc-ng release" in a commit log is that it's not going to be very informative 6 months or 2 years from now, when someone reads the commit log :-)
Saying "Since uClibc-ng 1.0.30, the missing functions are supported" makes it very clear, and will remain useful in the future.

You are totally right. Can you fix it up when commiting?

Thanks
Waldemar

Thomas Petazzoni

2018-06-30 16:38 UTC #5 lore raw

PATCH 1/1 Revert "zeromq: needs NPTL"

In reply to Waldemar Brodkorb

Hello,

Quoted 6 lines · Waldemar Brodkorb

This reverts commit 1e2a8d4111f57e79c1848c7a70c6501e2bdacd58.
Latest uClibc-ng release supports the missing functions even for Linuxthreads. The toolchains must be rebuilded before commit.
Signed-off-by Waldemar Brodkorb <[email protected]>

Quoted 12 lines

---
 package/circus/Config.in       | 6 +++---
 package/cppzmq/Config.in       | 6 +++---
 package/czmq/Config.in         | 6 +++---
 package/filemq/Config.in       | 6 +++---
 package/mongrel2/Config.in     | 6 +++---
 package/php-zmq/Config.in      | 6 +++---
 package/python-pyzmq/Config.in | 6 +++---
 package/zeromq/Config.in       | 6 +++---
 package/zmqpp/Config.in        | 6 +++---
 package/zyre/Config.in         | 6 +++---
 10 files changed, 30 insertions(+), 30 deletions(-)

Now that I have rebuilt and deployed updated toolchains, I've applied this patch after fixing the commit log, as we discussed previously.

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com