From ffce626f33ca3415b954c9af4f58bd77a0b2f7e2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 24 Feb 2023 11:10:39 +0100 Subject: [PATCH] package/libblockdev: needs locale locale_t is unconditionally used since version 1.5 and https://github.com/storaged-project/libblockdev/commit/4ed6f0b3a46fc77554dab661c22150829aa75966 resulting in the following build failure since the addition of the package in commit 0c52826291d1884db0f8f35130216065fbc7b574: module.c:33:37: error: unknown type name 'locale_t' 33 | static char *strerror_l(int errnum, locale_t locale UNUSED) | ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/ede9eb1f13d56c77005cc448416fb2efa9d16ff0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit a6b4217312815379a7c52bf5d53752dbe0838645) Signed-off-by: Peter Korsgaard --- package/libblockdev/Config.in | 6 ++++-- package/udisks/Config.in | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in index 4389fd794c..4f98621bd8 100644 --- a/package/libblockdev/Config.in +++ b/package/libblockdev/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_LIBBLOCKDEV depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_ENABLE_LOCALE select BR2_PACKAGE_KMOD select BR2_PACKAGE_LIBGLIB2 help @@ -66,7 +67,8 @@ config BR2_PACKAGE_LIBBLOCKDEV_SWAP endif -comment "libblockdev needs udev /dev management and a toolchain w/ wchar, threads, dynamic library" +comment "libblockdev needs udev /dev management and a toolchain w/ wchar, threads, dynamic library, locale" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV || BR2_STATIC_LIBS || \ - !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_ENABLE_LOCALE diff --git a/package/udisks/Config.in b/package/udisks/Config.in index 5d0b96f3c0..ad68d4f14d 100644 --- a/package/udisks/Config.in +++ b/package/udisks/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_UDISKS bool "udisks" - depends on BR2_ENABLE_LOCALE # parted + depends on BR2_ENABLE_LOCALE # libblockdev, parted depends on BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # polkit -> C++17 depends on BR2_TOOLCHAIN_HAS_THREADS # polkit