Fix reverse dependencies of util-linux
PATCH v2 1/2 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.
---
Changes v1 -> v2:
- Moved packages, that directly needs wchar or when wchar dependency is pulled from other dependencies, into separate patch 2/2 of this series.
- All packages except circus, python-pyzmq are build tested for qemu x86 with wchar disabled or br-arm-basic config.
- circus, python-pyzmq depend on python which essentially depends on wchar, so these couldn't build test.
- gummiboot is failing with i386 related configs without this patch as well because stdint.h is not found. That failure isn't related to wchar.
- docker-engine with btrfs support is failing because execinfo.h is not found. It doesn't seem to be related as well.
- BR2_INIT_SYSTEMD depends on glibc toolchain. We explicitly selects BR2_USE_WCHAR for glibc based toolchains. So couldn't build test this package.
boot/gummiboot/Config.in | 4 ---- package/bcache-tools/Config.in | 5 ++--- package/btrfs-progs/Config.in | 5 ++--- package/circus/Config.in | 7 +++---- package/cppzmq/Config.in | 6 ++---- package/cryptsetup/Config.in | 5 ++--- package/czmq/Config.in | 6 ++---- package/docker-containerd/Config.in | 5 ++--- package/docker-engine/Config.in | 2 -- package/e2fsprogs/Config.in | 5 ----- package/filemq/Config.in | 6 ++---- package/gptfdisk/Config.in | 6 +++--- package/libcrossguid/Config.in | 6 ++---- package/lttng-tools/Config.in | 5 ++--- package/mongrel2/Config.in | 7 +++---- package/mtd/Config.in | 4 ---- package/ola/Config.in | 7 +++---- package/php-zmq/Config.in | 6 ++---- package/python-pyzmq/Config.in | 6 ++---- package/qpid-proton/Config.in | 5 ++--- package/systemd/Config.in | 1 - package/xfsprogs/Config.in | 5 ++--- package/zeromq/Config.in | 12 ++++++++---- package/zmqpp/Config.in | 13 +++++++------ package/zyre/Config.in | 6 ++---- 25 files changed, 55 insertions(+), 90 deletions(-)
boot/gummiboot/Config.in +0 -4
@@ -4,7 +4,6 @@ config BR2_TARGET_GUMMIBOOT select BR2_PACKAGE_GNU_EFI select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - depends on BR2_USE_WCHAR # util-linux help gummiboot is a simple UEFI boot manager which executes 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. http://freedesktop.org/wiki/Software/gummiboot/ - -comment "gummiboot needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR
package/bcache-tools/Config.in +2 -3
@@ -1,7 +1,6 @@ config BR2_PACKAGE_BCACHE_TOOLS bool "bcache tools" depends on BR2_PACKAGE_HAS_UDEV - depends on BR2_USE_WCHAR # util-linux depends on BR2_USE_MMU # util-linux (libblkid) select BR2_PACKAGE_UTIL_LINUX 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 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_PACKAGE_HAS_UDEV || !BR2_USE_WCHAR + depends on !BR2_PACKAGE_HAS_UDEV
package/btrfs-progs/Config.in +2 -3
@@ -1,6 +1,5 @@ config BR2_PACKAGE_BTRFS_PROGS bool "btrfs-progs" - depends on BR2_USE_WCHAR # util-linux depends on BR2_USE_MMU # util-linux depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_E2FSPROGS
@@ -14,6 +13,6 @@ config BR2_PACKAGE_BTRFS_PROGS 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_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS
package/circus/Config.in +3 -4
@@ -1,7 +1,6 @@ config BR2_PACKAGE_CIRCUS bool "circus" 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_TOOLCHAIN_HAS_THREADS # pyzmq -> zeromq depends on !BR2_TOOLCHAIN_USES_MUSL # python-psutil
@@ -16,7 +15,7 @@ config BR2_PACKAGE_CIRCUS https://circus.readthedocs.org/en/latest/ -comment "circus needs Python and a uClibc or glibc toolchain w/ C++, wchar, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL || \ +comment "circus needs Python and a uClibc or glibc toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_TOOLCHAIN_USES_MUSL || \ !(BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3)
package/cppzmq/Config.in +2 -4
@@ -1,7 +1,6 @@ config BR2_PACKAGE_CPPZMQ bool "cppzmq" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # util-linux depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq select BR2_PACKAGE_ZEROMQ help
@@ -9,6 +8,5 @@ config BR2_PACKAGE_CPPZMQ http://github.com/zeromq/cppzmq -comment "cppzmq needs a toolchain w/ C++, wchar, threads" - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \ - BR2_TOOLCHAIN_HAS_THREADS) +comment "cppzmq needs a toolchain w/ C++, threads" + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
package/cryptsetup/Config.in +2 -3
@@ -4,7 +4,6 @@ config BR2_PACKAGE_CRYPTSETUP depends on BR2_USE_MMU # lvm2 depends on !BR2_STATIC_LIBS # lvm2 depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 - depends on BR2_USE_WCHAR # util-linux select BR2_PACKAGE_POPT select BR2_PACKAGE_LVM2 select BR2_PACKAGE_UTIL_LINUX
@@ -16,7 +15,7 @@ config BR2_PACKAGE_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_WCHAR || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \ + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \ || BR2_TOOLCHAIN_USES_MUSL
package/czmq/Config.in +2 -4
@@ -3,14 +3,12 @@ config BR2_PACKAGE_CZMQ select BR2_PACKAGE_ZEROMQ depends on BR2_USE_MMU # fork() depends on BR2_INSTALL_LIBSTDCPP # zeromq - depends on BR2_USE_WCHAR # util-linux depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq help High-level C Binding for 0MQ 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_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \ - BR2_TOOLCHAIN_HAS_THREADS) + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
package/docker-containerd/Config.in +2 -3
@@ -4,7 +4,6 @@ config BR2_PACKAGE_DOCKER_CONTAINERD depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # util-linux - depends on BR2_USE_WCHAR # util-linux select BR2_PACKAGE_RUNC # runtime dependency select BR2_PACKAGE_UTIL_LINUX # runtime dependency select BR2_PACKAGE_UTIL_LINUX_BINARIES
@@ -16,8 +15,8 @@ config BR2_PACKAGE_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_CGO_LINKING_SUPPORTS depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + depends on !BR2_TOOLCHAIN_HAS_THREADS
package/docker-engine/Config.in +0 -2
@@ -14,7 +14,6 @@ if BR2_PACKAGE_DOCKER_ENGINE config BR2_PACKAGE_DOCKER_ENGINE_DAEMON bool "docker daemon" depends on BR2_USE_MMU # docker-containerd - depends on BR2_USE_WCHAR # docker-containerd select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency select BR2_PACKAGE_IPTABLES # 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 bool "btrfs filesystem driver" - depends on BR2_USE_WCHAR # btrfs-progs depends on BR2_USE_MMU # btrfs-progs depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs select BR2_PACKAGE_BTRFS_PROGS
package/e2fsprogs/Config.in +0 -5
@@ -1,6 +1,5 @@ config BR2_PACKAGE_E2FSPROGS bool "e2fsprogs" - depends on BR2_USE_WCHAR # util-linux depends on BR2_USE_MMU # util-linux/libblkid select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
@@ -100,7 +99,3 @@ config BR2_PACKAGE_E2FSPROGS_UUIDGEN default y endif - -comment "e2fsprogs needs a toolchain w/ wchar" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR
package/filemq/Config.in +2 -4
@@ -4,7 +4,6 @@ config BR2_PACKAGE_FILEMQ select BR2_PACKAGE_CZMQ select BR2_PACKAGE_ZEROMQ depends on BR2_INSTALL_LIBSTDCPP # zeromq - depends on BR2_USE_WCHAR # util-linux depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq depends on BR2_USE_MMU # czmq help
@@ -12,7 +11,6 @@ config BR2_PACKAGE_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_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \ - BR2_TOOLCHAIN_HAS_THREADS) + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
package/gptfdisk/Config.in +3 -3
@@ -1,10 +1,9 @@ -comment "gptfdisk needs a toolchain w/ wchar, C++" - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR) +comment "gptfdisk needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP config BR2_PACKAGE_GPTFDISK bool "gptfdisk" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # util-linux select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_GPTFDISK_GDISK if \
@@ -38,6 +37,7 @@ config BR2_PACKAGE_GPTFDISK_CGDISK bool "ncurses cgdisk" select BR2_PACKAGE_NCURSES 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 help Install the ncurses-based GUID partition table (GPT)
package/libcrossguid/Config.in +2 -4
@@ -2,7 +2,6 @@ config BR2_PACKAGE_LIBCROSSGUID bool "libcrossguid" depends on BR2_INSTALL_LIBSTDCPP 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_LIBUUID help
@@ -10,6 +9,5 @@ config BR2_PACKAGE_LIBCROSSGUID https://github.com/graeme-hill/crossguid -comment "libcrossguid needs a toolchain w/ C++, wchar, gcc >= 4.7" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 +comment "libcrossguid needs a toolchain w/ C++, gcc >= 4.7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
package/lttng-tools/Config.in +2 -3
@@ -2,7 +2,6 @@ config BR2_PACKAGE_LTTNG_TOOLS bool "lttng-tools" # liburcu only works on some architectures and requires thread support depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS - depends on BR2_USE_WCHAR # util-linux depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS # uses dlfcn select BR2_PACKAGE_LIBURCU
@@ -28,6 +27,6 @@ config BR2_PACKAGE_LTTNG_TOOLS 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_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
package/mongrel2/Config.in +3 -4
@@ -7,10 +7,10 @@ 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++, threads, wchar, dynamic library" +comment "mongrel2 needs a uClibc or glibc toolchain w/ C++, threads, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - BR2_STATIC_LIBS || !BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS config BR2_PACKAGE_MONGREL2 bool "mongrel2"
@@ -18,7 +18,6 @@ config BR2_PACKAGE_MONGREL2 select BR2_PACKAGE_ZEROMQ depends on BR2_INSTALL_LIBSTDCPP # 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_PACKAGE_MONGREL2_LIBC_SUPPORTS help
package/mtd/Config.in +0 -4
@@ -62,10 +62,6 @@ config BR2_PACKAGE_MTD_MKFSUBIFS select BR2_PACKAGE_LZO select BR2_PACKAGE_UTIL_LINUX 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 bool "mtd_debug"
package/ola/Config.in +3 -4
@@ -1,6 +1,6 @@ -comment "ola needs a toolchain w/ C++, threads, wchar, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS +comment "ola needs a toolchain w/ C++, threads, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ + || BR2_STATIC_LIBS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS menuconfig BR2_PACKAGE_OLA
@@ -10,7 +10,6 @@ menuconfig BR2_PACKAGE_OLA select BR2_PACKAGE_UTIL_LINUX depends on BR2_INSTALL_LIBSTDCPP # protobuf depends on !BR2_STATIC_LIBS # protobuf - depends on BR2_USE_WCHAR # util-linux depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS help
package/php-zmq/Config.in +2 -4
@@ -1,12 +1,10 @@ -comment "php-zmq needs a toolchain w/ C++, wchar, threads" - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR \ - && BR2_TOOLCHAIN_HAS_THREADS) +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_USE_WCHAR # util-linux depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_ZEROMQ help
package/python-pyzmq/Config.in +2 -4
@@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYZMQ bool "python-pyzmq" - depends on BR2_USE_WCHAR # zeromq depends on BR2_INSTALL_LIBSTDCPP # zeromq depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq select BR2_PACKAGE_ZEROMQ
@@ -9,7 +8,6 @@ config BR2_PACKAGE_PYTHON_PYZMQ 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_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \ - BR2_TOOLCHAIN_HAS_THREADS) + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
package/qpid-proton/Config.in +2 -3
@@ -1,7 +1,6 @@ config BR2_PACKAGE_QPID_PROTON bool "qpid-proton" 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_LIBUUID help
@@ -14,5 +13,5 @@ config BR2_PACKAGE_QPID_PROTON https://qpid.apache.org/proton/ -comment "qpid-proton needs a toolchain w/ dynamic library, wchar" - depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR +comment "qpid-proton needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS
package/systemd/Config.in +0 -1
@@ -10,7 +10,6 @@ config BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS menuconfig BR2_PACKAGE_SYSTEMD bool "systemd" depends on BR2_INIT_SYSTEMD - depends on BR2_USE_WCHAR # util-linux depends on !BR2_STATIC_LIBS # kmod depends on BR2_TOOLCHAIN_HAS_THREADS # dbus depends on BR2_USE_MMU # dbus
package/xfsprogs/Config.in +2 -3
@@ -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_WCHAR || BR2_TOOLCHAIN_USES_MUSL + depends on BR2_TOOLCHAIN_USES_MUSL config BR2_PACKAGE_XFSPROGS bool "xfsprogs" depends on BR2_USE_MMU # fork() - depends on BR2_USE_WCHAR # util-linux depends on !BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID
package/zeromq/Config.in +8 -4
@@ -1,11 +1,9 @@ -comment "zeromq needs a toolchain w/ C++, wchar, threads" - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \ - BR2_TOOLCHAIN_HAS_THREADS) +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_USE_WCHAR # util-linux depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID
@@ -38,10 +36,16 @@ config BR2_PACKAGE_ZEROMQ_NORM Add support for NACK-Oriented Reliable Multicast (RFC 5740) 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 bool "PGM/EPGM support" depends on BR2_TOOLCHAIN_HAS_SYNC_2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_USE_WCHAR # openpgm select BR2_PACKAGE_OPENPGM help Add support for Pragmatic General Multicast protocol (RFC 3208)
package/zmqpp/Config.in +7 -6
@@ -3,7 +3,6 @@ config BR2_PACKAGE_ZMQPP # c++1x support depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # util-linux depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq select BR2_PACKAGE_ZEROMQ help
@@ -14,9 +13,9 @@ config BR2_PACKAGE_ZMQPP http://github.com/benjamg/zmqpp -comment "zmqpp needs a toolchain w/ C++, wchar, threads, gcc >= 4.7" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 +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
@@ -24,13 +23,15 @@ config BR2_PACKAGE_ZMQPP_CLIENT bool "zmqpp client" depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS # boost + depends on BR2_USE_WCHAR # boost select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS help Build and install the zmqpp client, a command line tool that can be used to listen or send to zeromq sockets. -comment "zmqpp client needs a toolchain w/ dynamic library, threads" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS +comment "zmqpp client needs a toolchain w/ dynamic library, threads, wchar" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_USE_WCHAR endif
package/zyre/Config.in +2 -4
@@ -1,7 +1,6 @@ config BR2_PACKAGE_ZYRE bool "zyre" depends on BR2_INSTALL_LIBSTDCPP # zeromq - depends on BR2_USE_WCHAR # zeromq depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq depends on BR2_USE_MMU # czmq select BR2_PACKAGE_CZMQ
@@ -12,7 +11,6 @@ config BR2_PACKAGE_ZYRE 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_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \ - BR2_TOOLCHAIN_HAS_THREADS) + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
Signature · 1 line
2.6.2
PATCH v2 2/2 Update comments for 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 updates comments in Config.in for BR2_USE_WCHAR for reverse dependencies of util-linux which directly uses wchar now or when it is pulled from other dependencies.
eudev doesn't use wchar directly, but needs C99 compiler. Autotools generate code with wchar_t for checking C99 compiler.
---
Changes v1 -> v2:
- not present in v1
package/e2tools/Config.in | 2 +- package/eudev/Config.in | 2 +- package/f2fs-tools/Config.in | 2 +- package/freeswitch/Config.in | 2 +- package/gupnp/Config.in | 2 +- package/lttng-babeltrace/Config.in | 2 +- package/lttng-libust/Config.in | 2 +- package/samba4/Config.in | 2 +- package/taskd/Config.in | 2 +- package/xen/Config.in | 2 +- system/Config.in | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-)
package/e2tools/Config.in +1 -1
@@ -2,7 +2,7 @@ config BR2_PACKAGE_E2TOOLS bool "e2tools" select BR2_PACKAGE_E2FSPROGS depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_WCHAR # e2fsprogs + depends on BR2_USE_WCHAR # uses wchar_t depends on BR2_USE_MMU # e2fsprogs help E2tools is a simple set of GPL'ed utilities to read, write,
package/eudev/Config.in +1 -1
@@ -2,7 +2,7 @@ config BR2_PACKAGE_EUDEV bool "eudev" depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV depends on BR2_USE_MMU # uses fork() - depends on BR2_USE_WCHAR # util-linux + depends on BR2_USE_WCHAR # needs C99 compiler depends on !BR2_STATIC_LIBS # kmod select BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_UTIL_LINUX
package/f2fs-tools/Config.in +1 -1
@@ -2,7 +2,7 @@ config BR2_PACKAGE_F2FS_TOOLS bool "f2fs-tools" select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID - depends on BR2_USE_WCHAR # util-linux + depends on BR2_USE_WCHAR # uses wchar_t help Tools for Flash-Friendly File System (F2FS)
package/freeswitch/Config.in +1 -1
@@ -4,7 +4,7 @@ config BR2_PACKAGE_FREESWITCH depends on !BR2_STATIC_LIBS # apr, included in freeswitch source depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # apr, included in freeswitch source - depends on BR2_USE_WCHAR # libuuid + depends on BR2_USE_WCHAR # uses wchar_t select BR2_PACKAGE_FFMPEG_AVRESAMPLE if BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG_SWSCALE if BR2_PACKAGE_FFMPEG select BR2_PACKAGE_LIBCURL
package/gupnp/Config.in +1 -1
@@ -1,6 +1,6 @@ config BR2_PACKAGE_GUPNP bool "gupnp" - depends on BR2_USE_WCHAR # glib2, gssdp, util-linux + depends on BR2_USE_WCHAR # glib2, gssdp depends on BR2_TOOLCHAIN_HAS_THREADS # glib2, gssdp depends on BR2_USE_MMU # glib2, gssdp select BR2_PACKAGE_LIBGLIB2
package/lttng-babeltrace/Config.in +1 -1
@@ -4,7 +4,7 @@ config BR2_PACKAGE_LTTNG_BABELTRACE select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_POPT - depends on BR2_USE_WCHAR # libglib2, util-linux + depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 help
package/lttng-libust/Config.in +1 -1
@@ -3,7 +3,7 @@ config BR2_PACKAGE_LTTNG_LIBUST select BR2_PACKAGE_LIBURCU select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID - depends on BR2_USE_WCHAR # util-linux + depends on BR2_USE_WCHAR # uses wchar_t # liburcu only works on some architectures and requires threads support" depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS
package/samba4/Config.in +1 -1
@@ -7,7 +7,7 @@ comment "samba4 needs a toolchain w/ RPC, wchar, dynamic library, threads" config BR2_PACKAGE_SAMBA4 bool "samba4" depends on BR2_USE_MMU # fork() - depends on BR2_USE_WCHAR # e2fsprogs + depends on BR2_USE_WCHAR # python depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC depends on BR2_TOOLCHAIN_HAS_THREADS # python -> libffi depends on !BR2_STATIC_LIBS # python
package/taskd/Config.in +1 -1
@@ -1,6 +1,6 @@ config BR2_PACKAGE_TASKD bool "taskd" - depends on BR2_USE_WCHAR # gnutls, util-linux + depends on BR2_USE_WCHAR # gnutls depends on BR2_USE_MMU # fork() depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_GNUTLS
package/xen/Config.in +1 -1
@@ -22,7 +22,7 @@ config BR2_PACKAGE_XEN_TOOLS depends on !BR2_STATIC_LIBS # dtc (libfdt) depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_WCHAR # libglib2, util-linux + depends on BR2_USE_WCHAR # libglib2 select BR2_PACKAGE_DTC select BR2_PACKAGE_LIBAIO select BR2_PACKAGE_LIBGLIB2
system/Config.in +1 -1
@@ -158,7 +158,7 @@ config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV bool "Dynamic using devtmpfs + eudev" - depends on BR2_USE_WCHAR + depends on BR2_USE_WCHAR # eudev depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # eudev select BR2_PACKAGE_EUDEV
Signature · 1 line
2.6.2
PATCH v2 1/2 Fix reverse dependencies of util-linux
In reply to Rahul BedarkarHello,
Quoted 20 lines · Rahul Bedarkar
Commit
006a328ad6be("util-linux: fix build with ncurses") removed dependency onBR2_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_WCHARas it is not required by package itself.Fixes 006a328ad6be ("util-linux: fix build with ncurses")Signed-off-by Rahul Bedarkar <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Baruch Siach <[email protected]>---
Changes v1 -> v2:
- Moved packages, that directly needs wchar or when wchar dependency is pulled from other dependencies, into separate patch 2/2 of this series.
- All packages except circus, python-pyzmq are build tested for qemu x86 with wchar disabled or br-arm-basic config.
- circus, python-pyzmq depend on python which essentially depends on wchar, so these couldn't build test.
Quoted 8 lines
- gummiboot is failing with i386 related configs without this patch as well because
stdint.his not found. That failure isn't related to wchar.
- docker-engine with btrfs support is failing becauseexecinfo.his not found. It doesn't seem to be related as well.
-BR2_INIT_SYSTEMDdepends on glibc toolchain. We explicitly selectsBR2_USE_WCHARfor glibc based toolchains. So couldn't build test this package.
I've applied both patches, thanks! If you could watch the autobuilders in the next few days and see if any new wchar related issue appears, it would be nice. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com