Bläddra i källkod

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 <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Fabrice Fontaine 2 år sedan
förälder
incheckning
a6b4217312
2 ändrade filer med 5 tillägg och 3 borttagningar
  1. 4 2
      package/libblockdev/Config.in
  2. 1 1
      package/udisks/Config.in

+ 4 - 2
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

+ 1 - 1
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