Revert "lvm2: disable build with uClibc-ng"

This reverts commit 66f136a9f64b880eefa769c1261916773d8f28c0.

Issue fixed with uClibc-ng update to 1.0.24.

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in
index 42cf3ab17a883c6b42ba979606aba33697652e37..3ca23ba72137b48b9b713c6cda6065bf260e6c7c 100644 (file)
--- a/package/cryptsetup/Config.in
+++ b/package/cryptsetup/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_CRYPTSETUP
        depends on BR2_USE_MMU # lvm2
        depends on !BR2_STATIC_LIBS # lvm2
        depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2
-       depends on !BR2_TOOLCHAIN_USES_UCLIBC # lvm2
        select BR2_PACKAGE_POPT
        select BR2_PACKAGE_LVM2
        select BR2_PACKAGE_UTIL_LINUX
@@ -16,7 +15,7 @@ config BR2_PACKAGE_CRYPTSETUP
 
          https://gitlab.com/cryptsetup/cryptsetup
 
-comment "cryptsetup needs a glibc toolchain w/ threads, dynamic library"
+comment "cryptsetup needs a glibc or uClibc toolchain w/ threads, dynamic library"
        depends on BR2_USE_MMU
        depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \
-               || BR2_TOOLCHAIN_USES_MUSL || BR2_TOOLCHAIN_USES_UCLIBC
+               || BR2_TOOLCHAIN_USES_MUSL

diff --git a/package/dmraid/Config.in b/package/dmraid/Config.in
index 61976bbb27c71b7e788fbab08cbdb40cb19d51db..583f3f272cfbaea2b12e0f47b47992d13e05a684 100644 (file)
--- a/package/dmraid/Config.in
+++ b/package/dmraid/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_DMRAID
        depends on BR2_USE_MMU # lvm2
        depends on !BR2_STATIC_LIBS # lvm2
        depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2
-       depends on !BR2_TOOLCHAIN_USES_UCLIBC # lvm2
        select BR2_PACKAGE_LVM2
        help
          dmraid discovers, activates, deactivates and displays properties
@@ -13,7 +12,7 @@ config BR2_PACKAGE_DMRAID
          dmraid uses the Linux device-mapper to create devices with
          respective mappings for the ATARAID sets discovered.
 
-comment "dmraid needs a glibc toolchain w/ threads, dynamic library"
+comment "dmraid needs a glibc or uClibc toolchain w/ threads, dynamic library"
        depends on BR2_USE_MMU
        depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \
-               || BR2_TOOLCHAIN_USES_MUSL || BR2_TOOLCHAIN_USES_UCLIBC
+               || BR2_TOOLCHAIN_USES_MUSL

diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in
index caaf639415f4af6793813d8af5f7d4b0c21fd636..05670a716e0dc6180d92768dc0cf1bbead55ec64 100644 (file)
--- a/package/docker-engine/Config.in
+++ b/package/docker-engine/Config.in
@@ -47,7 +47,6 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER
        depends on BR2_USE_MMU # lvm2
        depends on !BR2_STATIC_LIBS # lvm2
        depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2
-       depends on !BR2_TOOLCHAIN_USES_UCLIBC # lvm2
        select BR2_PACKAGE_LVM2
        select BR2_PACKAGE_LVM2_APP_LIBRARY
        help

diff --git a/package/lvm2/Config.in b/package/lvm2/Config.in
index b28b1976da597552fa84f07102ce7ddbc61445e2..0f606494ba359f41ac927606b3339c64d9437860 100644 (file)
--- a/package/lvm2/Config.in
+++ b/package/lvm2/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_LVM2
        depends on !BR2_STATIC_LIBS # It fails to build statically
        # http://lists.busybox.net/pipermail/buildroot/2016-August/170592.html
        depends on !BR2_TOOLCHAIN_USES_MUSL
-       depends on !BR2_TOOLCHAIN_USES_UCLIBC # missing floorl(), nearbyintl()
        help
          This is LVM2, the rewrite of The Linux Logical Volume Manager.
          LVM supports enterprise level volume management of disk and disk
@@ -39,7 +38,6 @@ config BR2_PACKAGE_LVM2_APP_LIBRARY
 
 endif
 
-comment "lvm2 needs a glibc toolchain w/ threads, dynamic library"
+comment "lvm2 needs a glibc or uClibc toolchain w/ threads, dynamic library"
        depends on BR2_USE_MMU
-       depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \
-               || BR2_TOOLCHAIN_USES_MUSL || BR2_TOOLCHAIN_USES_UCLIBC
+       depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL

diff --git a/package/udisks/Config.in b/package/udisks/Config.in
index 475f4986e1c7b32a90082ba496c2f8df81431cfc..029860fc5c4dea29edc3a3af2806cda63b6d3cf3 100644 (file)
--- a/package/udisks/Config.in
+++ b/package/udisks/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_UDISKS
        depends on BR2_USE_MMU # lvm2
        depends on !BR2_STATIC_LIBS # lvm2
        depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2
-       depends on !BR2_TOOLCHAIN_USES_UCLIBC # lvm2
        select BR2_PACKAGE_DBUS
        select BR2_PACKAGE_DBUS_GLIB
        depends on BR2_USE_WCHAR # dbus-glib -> glib2
@@ -41,8 +40,7 @@ comment "udisks needs udev /dev management"
        depends on BR2_USE_MMU
        depends on !BR2_PACKAGE_HAS_UDEV
 
-comment "udisks needs a glibc toolchain w/ wchar, threads, dynamic library"
+comment "udisks needs a glibc or uClibc toolchain w/ wchar, threads, dynamic library"
        depends on BR2_USE_MMU
        depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
-               BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL \
-               || BR2_TOOLCHAIN_USES_UCLIBC
+               BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL