From 4d2f85fd017fbd0a260bbf1044bb606b15d8cdc8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 12 Sep 2026 23:18:00 +0200 Subject: [PATCH] package/*/Config.in: harmonize select of BR2_PACKAGE_ARGP_STANDALONE BR2_PACKAGE_ARGP_STANDALONE is defined as follows: config BR2_PACKAGE_ARGP_STANDALONE depends on !BR2_TOOLCHAIN_USES_GLIBC Some packages did: select BR2_PACKAGE_ARGP_STANDALONE if !BR2_TOOLCHAIN_USES_GLIBC while a number of others did: select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL This commit harmonizes the situation, by settling on the first solution ("if !BR2_TOOLCHAIN_USES_GLIBC") as it matches how BR2_PACKAGE_ARGP_STANDALONE is defined in the first place. No functional change. Signed-off-by: Thomas Petazzoni Signed-off-by: Julien Olivain (cherry picked from commit 1799bf3680e3f50ff50b299d64c3c8ce533cf038) Signed-off-by: Thomas Perale --- package/bcusdk/Config.in | 2 +- package/cpio/Config.in | 2 +- package/cryptsetup/Config.in | 3 +-- package/freeipmi/Config.in | 2 +- package/iucode-tool/Config.in | 3 +-- package/libuio/Config.in | 2 +- package/libv4l/Config.in | 2 +- package/linknx/Config.in | 3 +-- package/rng-tools/Config.in | 2 +- package/uftrace/Config.in | 4 +--- package/zchunk/Config.in | 2 +- 11 files changed, 11 insertions(+), 16 deletions(-) diff --git a/package/bcusdk/Config.in b/package/bcusdk/Config.in index 8f9330e0d1..7131577eb2 100644 --- a/package/bcusdk/Config.in +++ b/package/bcusdk/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_BCUSDK depends on BR2_USE_MMU # libpthsem depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_LIBPTHSEM - select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_ARGP_STANDALONE if !BR2_TOOLCHAIN_USES_GLIBC help A free development environment for the Bus Coupling Units of the European Installation Bus. diff --git a/package/cpio/Config.in b/package/cpio/Config.in index 3ef0402c3b..f3637746d3 100644 --- a/package/cpio/Config.in +++ b/package/cpio/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_CPIO bool "cpio" depends on BR2_USE_WCHAR # Need argp.h support - select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_ARGP_STANDALONE if !BR2_TOOLCHAIN_USES_GLIBC help cpio archive utility for creation and extraction. diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in index f36883ea47..3bde1b164d 100644 --- a/package/cryptsetup/Config.in +++ b/package/cryptsetup/Config.in @@ -4,8 +4,7 @@ config BR2_PACKAGE_CRYPTSETUP depends on BR2_USE_MMU # lvm2, libargon2 depends on !BR2_STATIC_LIBS # lvm2, libargon2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c - select BR2_PACKAGE_ARGP_STANDALONE if BR2_PACKAGE_LIBSSH && \ - (BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL) + select BR2_PACKAGE_ARGP_STANDALONE if BR2_PACKAGE_LIBSSH && !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_POPT select BR2_PACKAGE_LVM2 select BR2_PACKAGE_UTIL_LINUX diff --git a/package/freeipmi/Config.in b/package/freeipmi/Config.in index 8ef2e137fa..d4fda0e2f8 100644 --- a/package/freeipmi/Config.in +++ b/package/freeipmi/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_FREEIPMI bool "freeipmi" depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_ARGP_STANDALONE if !BR2_TOOLCHAIN_USES_GLIBC help FreeIPMI provides in-band and out-of-band IPMI software based on the IPMI v1.5/2.0 specification. diff --git a/package/iucode-tool/Config.in b/package/iucode-tool/Config.in index f9f2521a42..d9c1120c68 100644 --- a/package/iucode-tool/Config.in +++ b/package/iucode-tool/Config.in @@ -3,8 +3,7 @@ config BR2_PACKAGE_IUCODE_TOOL depends on BR2_x86_64 || BR2_i386 select BR2_PACKAGE_INTEL_MICROCODE select BR2_PACKAGE_INTEL_MICROCODE_INSTALL_TARGET - select BR2_PACKAGE_ARGP_STANDALONE \ - if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_ARGP_STANDALONE if !BR2_TOOLCHAIN_USES_GLIBC help Intel processor microcode tool diff --git a/package/libuio/Config.in b/package/libuio/Config.in index 97be1e3d57..6483cf7018 100644 --- a/package/libuio/Config.in +++ b/package/libuio/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_LIBUIO bool "libuio" - select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_ARGP_STANDALONE if !BR2_TOOLCHAIN_USES_GLIBC help libuio is a light-weight C programming library to handle UIO (Userspace I/O) device discovery and binding task. diff --git a/package/libv4l/Config.in b/package/libv4l/Config.in index c88f280c3b..5d82fd59ba 100644 --- a/package/libv4l/Config.in +++ b/package/libv4l/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBV4L depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # media headers - select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_ARGP_STANDALONE if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help libv4l is a collection of libraries which adds a thin diff --git a/package/linknx/Config.in b/package/linknx/Config.in index 3b62ce2f95..1cc5248df4 100644 --- a/package/linknx/Config.in +++ b/package/linknx/Config.in @@ -3,8 +3,7 @@ config BR2_PACKAGE_LINKNX depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_MMU # libpthsem select BR2_PACKAGE_LIBPTHSEM - select BR2_PACKAGE_ARGP_STANDALONE \ - if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_ARGP_STANDALONE if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help Linknx is an automation platform providing high level diff --git a/package/rng-tools/Config.in b/package/rng-tools/Config.in index 7f08fa25fb..cb4034697a 100644 --- a/package/rng-tools/Config.in +++ b/package/rng-tools/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_RNG_TOOLS # pthread_setaffinity_np depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_MMU # libcap - select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_ARGP_STANDALONE if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBCAP select BR2_PACKAGE_OPENSSL help diff --git a/package/uftrace/Config.in b/package/uftrace/Config.in index 8f8c5d25fd..6ec2761fa8 100644 --- a/package/uftrace/Config.in +++ b/package/uftrace/Config.in @@ -10,9 +10,7 @@ config BR2_PACKAGE_UFTRACE depends on BR2_PACKAGE_UFTRACE_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_setname_np() depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_ARGP_STANDALONE if \ - BR2_TOOLCHAIN_USES_UCLIBC || \ - BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_ARGP_STANDALONE if !BR2_TOOLCHAIN_USES_GLIBC help The uftrace tool is to trace and analyze execution of a program written in C/C++. It was heavily inspired by the diff --git a/package/zchunk/Config.in b/package/zchunk/Config.in index 11463dd4bd..2f80c25a8a 100644 --- a/package/zchunk/Config.in +++ b/package/zchunk/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_ZCHUNK bool "zchunk" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_ARGP_STANDALONE if !BR2_TOOLCHAIN_USES_GLIBC help A file format designed for highly efficient deltas while maintaining good compression.