Skip to contentSkip to conversation

Revert "package/parted: disable on uclibc"

PATCH New Waldemar Brodkorb 2 participants 2 messages May 27, 2020 – Aug 29, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "package/parted: disable on uclibc"

This reverts commit 25b1dc4613326b1b2674ab07484993991ab90886.

This is fixed in uClibc-ng 1.0.34.

---
 package/parted/Config.in          | 6 ++----
 package/python-pyparted/Config.in | 6 ++----
 package/udisks/Config.in          | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)
package/parted/Config.in +2 -4
index a35b30662f..f48b365a2d 100644
@@ -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
package/python-pyparted/Config.in +2 -4
index 6e3bde2030..60f54a5484 100644
@@ -2,13 +2,11 @@ config BR2_PACKAGE_PYTHON_PYPARTED
 	bool "python-pyparted"
 	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"
-	depends on BR2_TOOLCHAIN_USES_UCLIBC || \
-		!BR2_ENABLE_LOCALE || !BR2_USE_WCHAR
+comment "pyparted needs a toolchain w/ locale, wchar"
+	depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR
package/udisks/Config.in +1 -1
index 04a632dd8d..f4044b0d0d 100644
@@ -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
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 Revert "package/parted: disable on uclibc"

Hello,

Quoted 3 lines · On Wed, 27 May 2020 11:50:58 +0200 Waldemar Brodkorb <[email protected]> wrote:

This reverts commit 25b1dc4613326b1b2674ab07484993991ab90886.

This is fixed in uClibc-ng 1.0.34.

In fact, it was fixed in uClibc-ng 1.0.33, not 1.0.34.

I was initially a bit puzzled because both Buildroot 2019.11 and Buildroot 2020.02 are using uClibc-ng 1.0.32, and parted was failing to build with a Buildroot 2019.11 toolchain, but not a 2020.02 toolchain. Turned out we had backported the fix in 2020.02 on top of uClibc-ng 1.0.32.

Anyway, I've applied your patch to next. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com