package: fix reverse dependencies of util-linux

Commit 006a328ad6be ("util-linux: fix build with ncurses") removed
dependency on BR2_USE_WCHAR, but failed to update the reverse
dependencies of util-linux.

This commit fixes all such reverse dependencies by removing dependency
on BR2_USE_WCHAR as it is not required by package itself.

Fixes: 006a328ad6be ("util-linux: fix build with ncurses")
Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Rahul Bedarkar 2016-12-26 20:52:34 +05:30 committed by Thomas Petazzoni
parent bb17f64bfe
commit 4427fe2821
25 changed files with 55 additions and 90 deletions

View File

@ -4,7 +4,6 @@ config BR2_TARGET_GUMMIBOOT
select BR2_PACKAGE_GNU_EFI select BR2_PACKAGE_GNU_EFI
select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
depends on BR2_USE_WCHAR # util-linux
help help
gummiboot is a simple UEFI boot manager which executes gummiboot is a simple UEFI boot manager which executes
configured EFI images. The default entry is selected by a configured EFI images. The default entry is selected by a
@ -22,6 +21,3 @@ config BR2_TARGET_GUMMIBOOT
files will be located in /loader/ inside the EFI partition. files will be located in /loader/ inside the EFI partition.
http://freedesktop.org/wiki/Software/gummiboot/ http://freedesktop.org/wiki/Software/gummiboot/
comment "gummiboot needs a toolchain w/ wchar"
depends on !BR2_USE_WCHAR

View File

@ -1,7 +1,6 @@
config BR2_PACKAGE_BCACHE_TOOLS config BR2_PACKAGE_BCACHE_TOOLS
bool "bcache tools" bool "bcache tools"
depends on BR2_PACKAGE_HAS_UDEV depends on BR2_PACKAGE_HAS_UDEV
depends on BR2_USE_WCHAR # util-linux
depends on BR2_USE_MMU # util-linux (libblkid) depends on BR2_USE_MMU # util-linux (libblkid)
select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_UTIL_LINUX_LIBUUID
@ -16,6 +15,6 @@ config BR2_PACKAGE_BCACHE_TOOLS
This is the user space bcache tools, required to setup the linux This is the user space bcache tools, required to setup the linux
bcache feature of the Linux kernel. bcache feature of the Linux kernel.
comment "bcache-tools needs udev /dev management and a toolchain w/ wchar" comment "bcache-tools needs udev /dev management"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_PACKAGE_HAS_UDEV || !BR2_USE_WCHAR depends on !BR2_PACKAGE_HAS_UDEV

View File

@ -1,6 +1,5 @@
config BR2_PACKAGE_BTRFS_PROGS config BR2_PACKAGE_BTRFS_PROGS
bool "btrfs-progs" bool "btrfs-progs"
depends on BR2_USE_WCHAR # util-linux
depends on BR2_USE_MMU # util-linux depends on BR2_USE_MMU # util-linux
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_E2FSPROGS select BR2_PACKAGE_E2FSPROGS
@ -14,6 +13,6 @@ config BR2_PACKAGE_BTRFS_PROGS
https://btrfs.wiki.kernel.org/index.php/Main_Page https://btrfs.wiki.kernel.org/index.php/Main_Page
comment "btrfs-progs needs a toolchain w/ wchar, threads" comment "btrfs-progs needs a toolchain w/ threads"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_HAS_THREADS

View File

@ -1,7 +1,6 @@
config BR2_PACKAGE_CIRCUS 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_USE_WCHAR # pyzmq -> zeromq
depends on BR2_INSTALL_LIBSTDCPP # pyzmq -> zeromq depends on BR2_INSTALL_LIBSTDCPP # pyzmq -> zeromq
depends on BR2_TOOLCHAIN_HAS_THREADS # pyzmq -> zeromq depends on BR2_TOOLCHAIN_HAS_THREADS # pyzmq -> zeromq
depends on !BR2_TOOLCHAIN_USES_MUSL # python-psutil depends on !BR2_TOOLCHAIN_USES_MUSL # python-psutil
@ -16,7 +15,7 @@ config BR2_PACKAGE_CIRCUS
https://circus.readthedocs.org/en/latest/ https://circus.readthedocs.org/en/latest/
comment "circus needs Python and a uClibc or glibc toolchain w/ C++, wchar, threads" comment "circus needs Python and a uClibc or glibc toolchain w/ C++, threads"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL || \ BR2_TOOLCHAIN_USES_MUSL || \
!(BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3) !(BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3)

View File

@ -1,7 +1,6 @@
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_USE_WCHAR # util-linux
depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
select BR2_PACKAGE_ZEROMQ select BR2_PACKAGE_ZEROMQ
help help
@ -9,6 +8,5 @@ config BR2_PACKAGE_CPPZMQ
http://github.com/zeromq/cppzmq http://github.com/zeromq/cppzmq
comment "cppzmq needs a toolchain w/ C++, wchar, threads" comment "cppzmq needs a toolchain w/ C++, threads"
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \ depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
BR2_TOOLCHAIN_HAS_THREADS)

View File

@ -4,7 +4,6 @@ config BR2_PACKAGE_CRYPTSETUP
depends on BR2_USE_MMU # lvm2 depends on BR2_USE_MMU # lvm2
depends on !BR2_STATIC_LIBS # lvm2 depends on !BR2_STATIC_LIBS # lvm2
depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2
depends on BR2_USE_WCHAR # util-linux
select BR2_PACKAGE_POPT select BR2_PACKAGE_POPT
select BR2_PACKAGE_LVM2 select BR2_PACKAGE_LVM2
select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX
@ -16,7 +15,7 @@ config BR2_PACKAGE_CRYPTSETUP
https://gitlab.com/cryptsetup/cryptsetup https://gitlab.com/cryptsetup/cryptsetup
comment "cryptsetup needs a glibc or uClibc toolchain w/ wchar, threads, dynamic library" comment "cryptsetup needs a glibc or uClibc toolchain w/ threads, dynamic library"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \ depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \
|| BR2_TOOLCHAIN_USES_MUSL || BR2_TOOLCHAIN_USES_MUSL

View File

@ -3,14 +3,12 @@ config BR2_PACKAGE_CZMQ
select BR2_PACKAGE_ZEROMQ select BR2_PACKAGE_ZEROMQ
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_USE_WCHAR # util-linux
depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq depends on BR2_TOOLCHAIN_HAS_THREADS # 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++, wchar, threads" comment "czmq needs a toolchain w/ C++, threads"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \ depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
BR2_TOOLCHAIN_HAS_THREADS)

View File

@ -4,7 +4,6 @@ config BR2_PACKAGE_DOCKER_CONTAINERD
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # util-linux depends on BR2_USE_MMU # util-linux
depends on BR2_USE_WCHAR # util-linux
select BR2_PACKAGE_RUNC # runtime dependency select BR2_PACKAGE_RUNC # runtime dependency
select BR2_PACKAGE_UTIL_LINUX # runtime dependency select BR2_PACKAGE_UTIL_LINUX # runtime dependency
select BR2_PACKAGE_UTIL_LINUX_BINARIES select BR2_PACKAGE_UTIL_LINUX_BINARIES
@ -16,8 +15,8 @@ config BR2_PACKAGE_DOCKER_CONTAINERD
https://github.com/docker/containerd https://github.com/docker/containerd
comment "docker-containerd needs a toolchain w/ threads, wchar" comment "docker-containerd needs a toolchain w/ threads"
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR depends on !BR2_TOOLCHAIN_HAS_THREADS

View File

@ -14,7 +14,6 @@ if BR2_PACKAGE_DOCKER_ENGINE
config BR2_PACKAGE_DOCKER_ENGINE_DAEMON config BR2_PACKAGE_DOCKER_ENGINE_DAEMON
bool "docker daemon" bool "docker daemon"
depends on BR2_USE_MMU # docker-containerd depends on BR2_USE_MMU # docker-containerd
depends on BR2_USE_WCHAR # docker-containerd
select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency
select BR2_PACKAGE_IPTABLES # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency
select BR2_PACKAGE_SQLITE # runtime dependency select BR2_PACKAGE_SQLITE # runtime dependency
@ -30,7 +29,6 @@ if BR2_PACKAGE_DOCKER_ENGINE_DAEMON
config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS
bool "btrfs filesystem driver" bool "btrfs filesystem driver"
depends on BR2_USE_WCHAR # btrfs-progs
depends on BR2_USE_MMU # btrfs-progs depends on BR2_USE_MMU # btrfs-progs
depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs
select BR2_PACKAGE_BTRFS_PROGS select BR2_PACKAGE_BTRFS_PROGS

View File

@ -1,6 +1,5 @@
config BR2_PACKAGE_E2FSPROGS config BR2_PACKAGE_E2FSPROGS
bool "e2fsprogs" bool "e2fsprogs"
depends on BR2_USE_WCHAR # util-linux
depends on BR2_USE_MMU # util-linux/libblkid depends on BR2_USE_MMU # util-linux/libblkid
select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
@ -100,7 +99,3 @@ config BR2_PACKAGE_E2FSPROGS_UUIDGEN
default y default y
endif endif
comment "e2fsprogs needs a toolchain w/ wchar"
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR

View File

@ -4,7 +4,6 @@ config BR2_PACKAGE_FILEMQ
select BR2_PACKAGE_CZMQ select BR2_PACKAGE_CZMQ
select BR2_PACKAGE_ZEROMQ select BR2_PACKAGE_ZEROMQ
depends on BR2_INSTALL_LIBSTDCPP # zeromq depends on BR2_INSTALL_LIBSTDCPP # zeromq
depends on BR2_USE_WCHAR # util-linux
depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
depends on BR2_USE_MMU # czmq depends on BR2_USE_MMU # czmq
help help
@ -12,7 +11,6 @@ config BR2_PACKAGE_FILEMQ
http://github.com/zeromq/filemq http://github.com/zeromq/filemq
comment "filemq needs a toolchain w/ C++, wchar, threads" comment "filemq needs a toolchain w/ C++, threads"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \ depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
BR2_TOOLCHAIN_HAS_THREADS)

View File

@ -1,10 +1,9 @@
comment "gptfdisk needs a toolchain w/ wchar, C++" comment "gptfdisk needs a toolchain w/ C++"
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR) depends on !BR2_INSTALL_LIBSTDCPP
config BR2_PACKAGE_GPTFDISK config BR2_PACKAGE_GPTFDISK
bool "gptfdisk" bool "gptfdisk"
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR # util-linux
select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_UTIL_LINUX_LIBUUID
select BR2_PACKAGE_GPTFDISK_GDISK if \ select BR2_PACKAGE_GPTFDISK_GDISK if \
@ -38,6 +37,7 @@ config BR2_PACKAGE_GPTFDISK_CGDISK
bool "ncurses cgdisk" bool "ncurses cgdisk"
select BR2_PACKAGE_NCURSES select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_NCURSES_WCHAR # needed because of UTF-16 select BR2_PACKAGE_NCURSES_WCHAR # needed because of UTF-16
depends on BR2_USE_WCHAR # ncurses wchar
depends on !(BR2_bfin && BR2_BINFMT_FLAT) # ncurses wchar support depends on !(BR2_bfin && BR2_BINFMT_FLAT) # ncurses wchar support
help help
Install the ncurses-based GUID partition table (GPT) Install the ncurses-based GUID partition table (GPT)

View File

@ -2,7 +2,6 @@ config BR2_PACKAGE_LIBCROSSGUID
bool "libcrossguid" bool "libcrossguid"
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11
depends on BR2_USE_WCHAR # util-linux
select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_UTIL_LINUX_LIBUUID
help help
@ -10,6 +9,5 @@ config BR2_PACKAGE_LIBCROSSGUID
https://github.com/graeme-hill/crossguid https://github.com/graeme-hill/crossguid
comment "libcrossguid needs a toolchain w/ C++, wchar, gcc >= 4.7" comment "libcrossguid needs a toolchain w/ C++, gcc >= 4.7"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7

View File

@ -2,7 +2,6 @@ config BR2_PACKAGE_LTTNG_TOOLS
bool "lttng-tools" bool "lttng-tools"
# liburcu only works on some architectures and requires thread support # liburcu only works on some architectures and requires thread support
depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
depends on BR2_USE_WCHAR # util-linux
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_STATIC_LIBS # uses dlfcn depends on !BR2_STATIC_LIBS # uses dlfcn
select BR2_PACKAGE_LIBURCU select BR2_PACKAGE_LIBURCU
@ -28,6 +27,6 @@ config BR2_PACKAGE_LTTNG_TOOLS
http://lttng.org http://lttng.org
comment "lttng-tools needs a toolchain w/ threads, wchar, dynamic library" comment "lttng-tools needs a toolchain w/ threads, dynamic library"
depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || BR2_STATIC_LIBS depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

View File

@ -7,10 +7,10 @@ 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++, threads, wchar, 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 || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
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"
@ -18,7 +18,6 @@ config BR2_PACKAGE_MONGREL2
select BR2_PACKAGE_ZEROMQ select BR2_PACKAGE_ZEROMQ
depends on BR2_INSTALL_LIBSTDCPP # zeromq depends on BR2_INSTALL_LIBSTDCPP # zeromq
depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
depends on BR2_USE_WCHAR # zeromq -> util-linux
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
help help

View File

@ -62,10 +62,6 @@ config BR2_PACKAGE_MTD_MKFSUBIFS
select BR2_PACKAGE_LZO select BR2_PACKAGE_LZO
select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_UTIL_LINUX_LIBUUID
depends on BR2_USE_WCHAR # util-linux
comment "mkfs.ubifs needs a toolchain w/ wchar"
depends on !BR2_USE_WCHAR
config BR2_PACKAGE_MTD_MTD_DEBUG config BR2_PACKAGE_MTD_MTD_DEBUG
bool "mtd_debug" bool "mtd_debug"

View File

@ -1,6 +1,6 @@
comment "ola needs a toolchain w/ C++, threads, wchar, dynamic library" comment "ola needs a toolchain w/ C++, threads, dynamic library"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \
|| !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || BR2_STATIC_LIBS
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
menuconfig BR2_PACKAGE_OLA menuconfig BR2_PACKAGE_OLA
@ -10,7 +10,6 @@ menuconfig BR2_PACKAGE_OLA
select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX
depends on BR2_INSTALL_LIBSTDCPP # protobuf depends on BR2_INSTALL_LIBSTDCPP # protobuf
depends on !BR2_STATIC_LIBS # protobuf depends on !BR2_STATIC_LIBS # protobuf
depends on BR2_USE_WCHAR # util-linux
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
help help

View File

@ -1,12 +1,10 @@
comment "php-zmq needs a toolchain w/ C++, wchar, threads" comment "php-zmq needs a toolchain w/ C++, threads"
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR \ depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
&& 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_USE_WCHAR # util-linux
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_ZEROMQ select BR2_PACKAGE_ZEROMQ
help help

View File

@ -1,6 +1,5 @@
config BR2_PACKAGE_PYTHON_PYZMQ config BR2_PACKAGE_PYTHON_PYZMQ
bool "python-pyzmq" bool "python-pyzmq"
depends on BR2_USE_WCHAR # zeromq
depends on BR2_INSTALL_LIBSTDCPP # zeromq depends on BR2_INSTALL_LIBSTDCPP # zeromq
depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
select BR2_PACKAGE_ZEROMQ select BR2_PACKAGE_ZEROMQ
@ -9,7 +8,6 @@ config BR2_PACKAGE_PYTHON_PYZMQ
http://zeromq.org/bindings:python http://zeromq.org/bindings:python
comment "python-pyzmq needs a toolchain w/ C++, wchar, threads" 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_USE_WCHAR && \ depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
BR2_TOOLCHAIN_HAS_THREADS)

View File

@ -1,7 +1,6 @@
config BR2_PACKAGE_QPID_PROTON config BR2_PACKAGE_QPID_PROTON
bool "qpid-proton" bool "qpid-proton"
depends on !BR2_STATIC_LIBS # build a shared library depends on !BR2_STATIC_LIBS # build a shared library
depends on BR2_USE_WCHAR # util-linux
select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_UTIL_LINUX_LIBUUID
help help
@ -14,5 +13,5 @@ config BR2_PACKAGE_QPID_PROTON
https://qpid.apache.org/proton/ https://qpid.apache.org/proton/
comment "qpid-proton needs a toolchain w/ dynamic library, wchar" comment "qpid-proton needs a toolchain w/ dynamic library"
depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR depends on BR2_STATIC_LIBS

View File

@ -10,7 +10,6 @@ config BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS
menuconfig BR2_PACKAGE_SYSTEMD menuconfig BR2_PACKAGE_SYSTEMD
bool "systemd" bool "systemd"
depends on BR2_INIT_SYSTEMD depends on BR2_INIT_SYSTEMD
depends on BR2_USE_WCHAR # util-linux
depends on !BR2_STATIC_LIBS # kmod depends on !BR2_STATIC_LIBS # kmod
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
depends on BR2_USE_MMU # dbus depends on BR2_USE_MMU # dbus

View File

@ -1,11 +1,10 @@
comment "xfsprogs needs a glibc or uClibc toolchain w/ wchar" comment "xfsprogs needs a glibc or uClibc toolchain"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || BR2_TOOLCHAIN_USES_MUSL depends on BR2_TOOLCHAIN_USES_MUSL
config BR2_PACKAGE_XFSPROGS config BR2_PACKAGE_XFSPROGS
bool "xfsprogs" bool "xfsprogs"
depends on BR2_USE_MMU # fork() depends on BR2_USE_MMU # fork()
depends on BR2_USE_WCHAR # util-linux
depends on !BR2_TOOLCHAIN_USES_MUSL depends on !BR2_TOOLCHAIN_USES_MUSL
select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_UTIL_LINUX_LIBUUID

View File

@ -1,11 +1,9 @@
comment "zeromq needs a toolchain w/ C++, wchar, threads" comment "zeromq needs a toolchain w/ C++, threads"
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \ depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
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_USE_WCHAR # util-linux
depends on BR2_TOOLCHAIN_HAS_THREADS 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
@ -38,10 +36,16 @@ config BR2_PACKAGE_ZEROMQ_NORM
Add support for NACK-Oriented Reliable Multicast (RFC 5740) Add support for NACK-Oriented Reliable Multicast (RFC 5740)
protocol. protocol.
comment "PGM/EPGM support needs a toolchain w/ wchar"
depends on BR2_TOOLCHAIN_HAS_SYNC_2
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_USE_WCHAR
config BR2_PACKAGE_ZEROMQ_PGM config BR2_PACKAGE_ZEROMQ_PGM
bool "PGM/EPGM support" bool "PGM/EPGM support"
depends on BR2_TOOLCHAIN_HAS_SYNC_2 depends on BR2_TOOLCHAIN_HAS_SYNC_2
depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on BR2_USE_WCHAR # openpgm
select BR2_PACKAGE_OPENPGM select BR2_PACKAGE_OPENPGM
help help
Add support for Pragmatic General Multicast protocol (RFC 3208) Add support for Pragmatic General Multicast protocol (RFC 3208)

View File

@ -3,7 +3,6 @@ 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_USE_WCHAR # util-linux
depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
select BR2_PACKAGE_ZEROMQ select BR2_PACKAGE_ZEROMQ
help help
@ -14,9 +13,9 @@ config BR2_PACKAGE_ZMQPP
http://github.com/benjamg/zmqpp http://github.com/benjamg/zmqpp
comment "zmqpp needs a toolchain w/ C++, wchar, threads, gcc >= 4.7" comment "zmqpp needs a toolchain w/ C++, threads, gcc >= 4.7"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
if BR2_PACKAGE_ZMQPP if BR2_PACKAGE_ZMQPP
@ -24,13 +23,15 @@ config BR2_PACKAGE_ZMQPP_CLIENT
bool "zmqpp client" bool "zmqpp client"
depends on !BR2_STATIC_LIBS depends on !BR2_STATIC_LIBS
depends on BR2_TOOLCHAIN_HAS_THREADS # boost depends on BR2_TOOLCHAIN_HAS_THREADS # boost
depends on BR2_USE_WCHAR # boost
select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST
select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
help help
Build and install the zmqpp client, a command line tool that can be Build and install the zmqpp client, a command line tool that can be
used to listen or send to zeromq sockets. used to listen or send to zeromq sockets.
comment "zmqpp client needs a toolchain w/ dynamic library, threads" comment "zmqpp client needs a toolchain w/ dynamic library, threads, wchar"
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \
|| !BR2_USE_WCHAR
endif endif

View File

@ -1,7 +1,6 @@
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_USE_WCHAR # zeromq
depends on BR2_TOOLCHAIN_HAS_THREADS # 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
@ -12,7 +11,6 @@ config BR2_PACKAGE_ZYRE
http://zyre.org http://zyre.org
comment "zyre needs a toolchain w/ C++, wchar, threads" comment "zyre needs a toolchain w/ C++, threads"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \ depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
BR2_TOOLCHAIN_HAS_THREADS)