Revert "zeromq: needs NPTL"
This reverts commit 1e2a8d4111
.
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>
This commit is contained in:
parent
037b861625
commit
35c3f7d3ab
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue