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:
Waldemar Brodkorb 2018-05-05 18:05:31 +02:00 committed by Thomas Petazzoni
parent 037b861625
commit 35c3f7d3ab
10 changed files with 30 additions and 30 deletions

View file

@ -2,7 +2,7 @@ config BR2_PACKAGE_CIRCUS
bool "circus" bool "circus"
depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
depends on BR2_INSTALL_LIBSTDCPP # pyzmq -> zeromq 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_IOWAIT # runtime
select BR2_PACKAGE_PYTHON_PSUTIL # runtime select BR2_PACKAGE_PYTHON_PSUTIL # runtime
select BR2_PACKAGE_PYTHON_PYZMQ # runtime select BR2_PACKAGE_PYTHON_PYZMQ # runtime
@ -14,6 +14,6 @@ config BR2_PACKAGE_CIRCUS
https://circus.readthedocs.org/en/latest/ https://circus.readthedocs.org/en/latest/
comment "circus needs Python and a toolchain w/ C++, NPTL" comment "circus needs Python and a toolchain w/ C++, threads"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
!(BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3) !(BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3)

View file

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

View file

@ -2,13 +2,13 @@ config BR2_PACKAGE_CZMQ
bool "czmq" bool "czmq"
depends on BR2_USE_MMU # fork() depends on BR2_USE_MMU # fork()
depends on BR2_INSTALL_LIBSTDCPP # zeromq 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 select BR2_PACKAGE_ZEROMQ
help help
High-level C Binding for 0MQ High-level C Binding for 0MQ
http://czmq.zeromq.org/ 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_USE_MMU
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS_NPTL) depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)

View file

@ -1,7 +1,7 @@
config BR2_PACKAGE_FILEMQ config BR2_PACKAGE_FILEMQ
bool "filemq" bool "filemq"
depends on BR2_INSTALL_LIBSTDCPP # zeromq 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 depends on BR2_USE_MMU # czmq
select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_CZMQ select BR2_PACKAGE_CZMQ
@ -11,6 +11,6 @@ config BR2_PACKAGE_FILEMQ
http://github.com/zeromq/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_USE_MMU
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS_NPTL) depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)

View file

@ -7,15 +7,15 @@ config BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS
default y if BR2_TOOLCHAIN_USES_UCLIBC && \ 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) (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 || \ 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 !BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS
config BR2_PACKAGE_MONGREL2 config BR2_PACKAGE_MONGREL2
bool "mongrel2" bool "mongrel2"
depends on BR2_INSTALL_LIBSTDCPP # zeromq 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_STATIC_LIBS # uses dlopen()
depends on BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS depends on BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS
select BR2_PACKAGE_SQLITE select BR2_PACKAGE_SQLITE

View file

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

View file

@ -1,13 +1,13 @@
config BR2_PACKAGE_PYTHON_PYZMQ config BR2_PACKAGE_PYTHON_PYZMQ
bool "python-pyzmq" bool "python-pyzmq"
depends on BR2_INSTALL_LIBSTDCPP # zeromq 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 select BR2_PACKAGE_ZEROMQ
help help
This package contains the python language binding for zeromq. This package contains the python language binding for zeromq.
http://zeromq.org/bindings:python 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_PACKAGE_PYTHON
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS_NPTL) depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)

View file

@ -1,10 +1,10 @@
comment "zeromq needs a toolchain w/ C++, NPTL" comment "zeromq needs a toolchain w/ C++, threads"
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS_NPTL) depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
config BR2_PACKAGE_ZEROMQ config BR2_PACKAGE_ZEROMQ
bool "zeromq" bool "zeromq"
depends on BR2_INSTALL_LIBSTDCPP 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
select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_UTIL_LINUX_LIBUUID
help help

View file

@ -3,7 +3,7 @@ config BR2_PACKAGE_ZMQPP
# c++1x support # c++1x support
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
depends on BR2_INSTALL_LIBSTDCPP 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 depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
select BR2_PACKAGE_ZEROMQ select BR2_PACKAGE_ZEROMQ
help help
@ -14,8 +14,8 @@ config BR2_PACKAGE_ZMQPP
http://github.com/benjamg/zmqpp http://github.com/benjamg/zmqpp
comment "zmqpp needs a toolchain w/ C++, NPTL, gcc >= 4.7" comment "zmqpp needs a toolchain w/ C++, threads, gcc >= 4.7"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
comment "zmqpp needs exception_ptr" comment "zmqpp needs exception_ptr"

View file

@ -1,7 +1,7 @@
config BR2_PACKAGE_ZYRE config BR2_PACKAGE_ZYRE
bool "zyre" bool "zyre"
depends on BR2_INSTALL_LIBSTDCPP # zeromq 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 depends on BR2_USE_MMU # czmq
select BR2_PACKAGE_CZMQ select BR2_PACKAGE_CZMQ
select BR2_PACKAGE_ZEROMQ select BR2_PACKAGE_ZEROMQ
@ -11,6 +11,6 @@ config BR2_PACKAGE_ZYRE
http://zyre.org 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_USE_MMU
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS_NPTL) depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)