Revert "package/parted: disable on uclibc"
authorWaldemar Brodkorb <wbx@openadk.org>
Wed, 27 May 2020 09:50:58 +0000 (11:50 +0200)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Sat, 29 Aug 2020 19:40:19 +0000 (21:40 +0200)
Commit 25b1dc4613326b1b2674ab07484993991ab90886 disabled parted on
uClibc due to the following build failure:

atari.c:221:9: error: dereferencing pointer to incomplete type 'struct __uclibc_locale_struct'
  return isalnum_l(part->id[0], atr_c_locale)

This was fixed in upstream uClibc-ng as of upstream commit
d1a3ca7ca56630fddde7311a0474eed4a21335a7, which was part of the 1.0.33
uClibc-ng release. On the Buildroot side, even though Buildroot
2020.02 was using uClibc-ng 1.0.32, we already had this patch
backported.

So we can now safely re-enable parted for uClibc-ng toolchains, as
well as its reverse dependencies.

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
package/parted/Config.in
package/python-pyparted/Config.in
package/udisks/Config.in

index a35b30662f95aa8a4b487155f8f2b74ce0630b72..f48b365a2d7a823d338a6098403a61b9173f1eb0 100644 (file)
@@ -2,7 +2,6 @@ config BR2_PACKAGE_PARTED
        bool "parted"
        depends on BR2_ENABLE_LOCALE
        depends on BR2_USE_WCHAR
-       depends on !BR2_TOOLCHAIN_USES_UCLIBC
        select BR2_PACKAGE_UTIL_LINUX
        select BR2_PACKAGE_UTIL_LINUX_LIBUUID
        help
@@ -10,6 +9,5 @@ config BR2_PACKAGE_PARTED
 
          http://www.gnu.org/software/parted/
 
-comment "parted needs a glibc or musl toolchain w/ locale, wchar"
-       depends on BR2_TOOLCHAIN_USES_UCLIBC || \
-               !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR
+comment "parted needs a toolchain w/ locale, wchar"
+       depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR
index 0e27ce1d2e856d63dabdf59bcf9f9bf2fa56cf02..0ed24f8836eb7fe3b862d200273c53a7036b569a 100644 (file)
@@ -3,14 +3,12 @@ config BR2_PACKAGE_PYTHON_PYPARTED
        depends on BR2_PACKAGE_PYTHON3
        depends on BR2_ENABLE_LOCALE # parted
        depends on BR2_USE_WCHAR
-       depends on !BR2_TOOLCHAIN_USES_UCLIBC # parted
        select BR2_PACKAGE_PARTED
        help
          Python bindings for GNU parted (libparted).
 
          https://github.com/rhinstaller/pyparted
 
-comment "pyparted needs a glibc or musl toolchain w/ locale, wchar"
+comment "pyparted needs a toolchain w/ locale, wchar"
        depends on BR2_PACKAGE_PYTHON3
-       depends on BR2_TOOLCHAIN_USES_UCLIBC || \
-               !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR
+       depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR
index 04a632dd8d47dee23dd18767ab8c09097725da72..f4044b0d0d1dfff00c8e9e82fad99a21c94bd00c 100644 (file)
@@ -9,7 +9,7 @@ config BR2_PACKAGE_UDISKS
        depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # polkit
        depends on BR2_USE_MMU # lvm2
        depends on BR2_USE_WCHAR # dbus-glib -> glib2
-       depends on !BR2_TOOLCHAIN_USES_UCLIBC # polkit, lvm2, parted
+       depends on !BR2_TOOLCHAIN_USES_UCLIBC # polkit, lvm2
        depends on !BR2_STATIC_LIBS # lvm2, spidermonkey
        select BR2_PACKAGE_DBUS
        select BR2_PACKAGE_DBUS_GLIB