Revert "zeromq: needs NPTL"

This reverts commit 1e2a8d4111f57e79c1848c7a70c6501e2bdacd58.

Since version 1.0.30, uClibc-ng release supports the missing functions
even for Linuxthreads, therefore the dependency on NPTL is no longer
needed.

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

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

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

diff --git a/package/czmq/Config.in b/package/czmq/Config.in
index d4ca46c36c5cfb026f409587810f06f7c433ec0d..71389fce51471768cb95fb0345e08b18d48a3d34 100644 (file)
--- a/package/czmq/Config.in
+++ b/package/czmq/Config.in
@@ -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)

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

diff --git a/package/mongrel2/Config.in b/package/mongrel2/Config.in
index 09bc8bd0a2eef7e24bd0b8b58868afe8244b0359..a9b09b786ce3b88fec58f7253240439571d59d5b 100644 (file)
--- a/package/mongrel2/Config.in
+++ b/package/mongrel2/Config.in
@@ -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

diff --git a/package/php-zmq/Config.in b/package/php-zmq/Config.in
index 3f7406b262ac2468ce8ae1c19d03282dffc99f47..058f93d9a862e330901ebc60dc76133a8837844a 100644 (file)
--- a/package/php-zmq/Config.in
+++ b/package/php-zmq/Config.in
@@ -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

diff --git a/package/python-pyzmq/Config.in b/package/python-pyzmq/Config.in
index 250191251940792f54916a44e8af84596b8e8fac..8f33a635c86e6f4577835d5e96887767f6bc5403 100644 (file)
--- a/package/python-pyzmq/Config.in
+++ b/package/python-pyzmq/Config.in
@@ -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)

diff --git a/package/zeromq/Config.in b/package/zeromq/Config.in
index 25e438ae073991c37af73564c50e5a2185a8922f..69be9f002c593b8af5ec008cbe4054c7200b72e8 100644 (file)
--- a/package/zeromq/Config.in
+++ b/package/zeromq/Config.in
@@ -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

diff --git a/package/zmqpp/Config.in b/package/zmqpp/Config.in
index e9209543a6ba3894c0bc3bdef47dbb25b03292ed..2c80e2883d53e19322b0448e99abad9fe25ad9fb 100644 (file)
--- a/package/zmqpp/Config.in
+++ b/package/zmqpp/Config.in
@@ -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
        depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
        select BR2_PACKAGE_ZEROMQ
        help
@@ -14,8 +14,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
 
 comment "zmqpp needs exception_ptr"

diff --git a/package/zyre/Config.in b/package/zyre/Config.in
index 340e9775c52680aa1a766a0e6c736de2c015aee9..21a0884ec62c213ca7b69f4141961239d4319339 100644 (file)
--- a/package/zyre/Config.in
+++ b/package/zyre/Config.in
@@ -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)